Commit
c2b91bf8f84496e67c7892054b8bd004b6a51e1b
Exists in
master
and in
27 other branches
1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, temp_ratings, 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
