Commit
7ef9d911370d1ddaad723811b8f2a74820667ca7
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/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 |
