Download as
Browse Code »

Commit 24ff33ac6dd04d3f20aa003f2e602f405983ddcf

Authored by Weblate
2 parents 738e8910 912d45b0
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 1 additions and 0 deletions   Show diff stats
app/models/environment.rb
  Diff comments   View file @24ff33a
... ... @@ -283,6 +283,7 @@ class Environment < ActiveRecord::Base
283 283 www.flickr.com
284 284 www.gmodules.com
285 285 www.youtube.com
  286 + openstreetmap.org
286 287 ] + ('a' .. 'z').map{|i| "#{i}.yimg.com"}
287 288  
288 289 settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
... ...