Commit
c2b91bf8f84496e67c7892054b8bd004b6a51e1b
Exists in
master
and in
21 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, news_page, script_to_update, template_mirror_block, tests, tests_fixies
Merge branch 'search-improvements' of gitlab.com:diguliu/noosfero into search-improvements
Conflicts:
app/controllers/public/search_controller.rb
app/helpers/search_helper.rb