Commit
1f2f3e4ccbd270dd719fe124c0b060fb77c05ec8
Exists in
master
and in
29 other branches
add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options
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 |
