Commit
6c93228d1815ea74ee2f188ad5753f694a1573ff
Exists in
master
and in
22 other branches
angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis
Merge commit 'refs/merge-requests/178' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/178
|
1
| development: |
1
| development: |
|
2
| adapter: sqlite3 |
2
| adapter: sqlite3 |
|
3
| database: db/development.db |
3
| database: db/development.db |
|
| |
4
| + timeout: 500 |
|
4
| |
5
| |
|
5
| test: &TEST |
6
| test: &TEST |
|
6
| adapter: sqlite3 |
7
| adapter: sqlite3 |
