Commit
1085e5cfd4505672ca886657c84134eb367b2e64
Exists in
master
and in
30 other branches
activities_block, btn-new-post, cosmetic_changes_people_and_communities_block, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page
Merge branch 'themes' of softwarepublico.gov.br:noosfero-themes/angular-theme into themes
Conflicts:
index.html.erb
