Commit
7ef9d911370d1ddaad723811b8f2a74820667ca7
Exists in
staging
and in
42 other branches
all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server
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 |
