Commit
7ef9d911370d1ddaad723811b8f2a74820667ca7
Exists in
master
and in
23 other branches
activate_plugin, api_fixies, api_tasks, article_blog_visualization_format, article_layout_refactoring, article_layout_temp, blog_page_bug, clone_article, communities_ratings, design_template, event_layout, fix_forum, fix_optional_fields, fix_suggest_article, folder_improvments, manage_organization, merge_deactive_and_ban, news_page, script_to_update, stable, template_mirror_block, tests, tests_fixies
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 |
