Commit
7ef9d911370d1ddaad723811b8f2a74820667ca7
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/242' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/242
I'm not adding the Gemfile.lock because even though it might annoy us
some times, it's a part of the repository that defines the proper
versions of the gems and it might be updated eventually.
Conflicts:
gitignore.example
|
| @@ -11,6 +11,7 @@ config/mongrel_cluster.yml |
| @@ -11,6 +11,7 @@ config/mongrel_cluster.yml |
|
11
| config/solr.yml |
11
| config/solr.yml |
|
12
| config/plugins |
12
| config/plugins |
|
13
| config/thin.yml |
13
| config/thin.yml |
|
| |
14
| +config/local.rb |
|
14
| index |
15
| index |
|
15
| locale |
16
| locale |
|
16
| log |
17
| log |
