Commit
b9f3eb2d0d25a115671d0095db35608153dcf09c
Exists in
master
and in
22 other branches
angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis
Merge branch 'shoppingcart' of gitorious.org:~diguliu/noosfero/digulius-noosfero into shoppingcart
Conflicts:
