Commit
c02f6e447b180686d192c9265ba7903beca48a3a
Authored by
Weblate
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 remote-tracking branch 'origin/master'
|
| @@ -4,7 +4,6 @@ |
| @@ -4,7 +4,6 @@ |
|
4
| comment_classification |
4
| comment_classification |
|
5
| ldap |
5
| ldap |
|
6
| send_email |
6
| send_email |
|
7
| - shopping_cart |
| |
|
8
| solr |
7
| solr |
|
9
| ] |
8
| ] |
|
10
| |
9
| |