Commit
e55c56688ee3ab72a49395c52d11e4280a5c8c7a
Exists in
master
and in
28 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, stable, temp_ratings, tests, tests_fixies
Merge branch 'mezuro-dev' into mezuro
Conflicts:
plugins/mezuro/public/javascripts/project_content.js
