Commit
5f1ae7656ab52611fc83f290eade1d5a3bd3a0ee
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/37' of git://gitorious.org/noosfero/noosfero i…
…nto merge-requests/37
|
1
| .gitignore |
1
| .gitignore |
|
2
| vendor/rails |
2
| vendor/rails |
|
3
| doc/api |
3
| doc/api |
|
4
| -doc/plugins |
4
| +doc/noosfero/plugins |
|
5
| tmp |
5
| tmp |
|
6
| config/database.yml |
6
| config/database.yml |
|
7
| config/session.secret |
7
| config/session.secret |
