Commit
1f2f3e4ccbd270dd719fe124c0b060fb77c05ec8
Exists in
master
and in
28 other branches
1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies
Merge commit 'refs/merge-requests/196' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/196
|
| @@ -2,7 +2,7 @@ |
| @@ -2,7 +2,7 @@ |
|
2
| pid: tmp/pids/thin.pid |
2
| pid: tmp/pids/thin.pid |
|
3
| address: 127.0.0.1 |
3
| address: 127.0.0.1 |
|
4
| user: noosfero |
4
| user: noosfero |
|
5
| -timeout: 30 |
5
| +timeout: 0 |
|
6
| port: 50000 |
6
| port: 50000 |
|
7
| log: log/thin.log |
7
| log: log/thin.log |
|
8
| max_conns: 1024 |
8
| max_conns: 1024 |
