Commit
2e423d998b4f8155ea4ed07bcbd50261507baad9
Authored by
Weblate
Exists in
master
and in
29 other branches
add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options
Merge remote-tracking branch 'origin/master'
|
| @@ -6,7 +6,6 @@ |
| @@ -6,7 +6,6 @@ |
|
6
| send_email |
6
| send_email |
|
7
| shopping_cart |
7
| shopping_cart |
|
8
| solr |
8
| solr |
|
9
| - tolerance_time |
| |
|
10
| ] |
9
| ] |
|
11
| |
10
| |
|
12
| @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template'] |
11
| @all_plugins = Dir.glob('plugins/*').map { |f| File.basename(f) } - ['template'] |