Commit 72cfd5811d1beaa9fb874fd339d71e4bd3bf87cc

Authored by Leandro Santos
2 parents b2083dec 56f0dd6e

Merge branches 'rails3' and 'ActionItem3268_template_management' into ActionItem…

…3268_template_management
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
lib/noosfero/plugin/routes.rb
1   -plugins_root = Rails.env.test? ? 'plugins' : File.join('config', 'plugins')
  1 +plugins_root = Rails.env.test? ? 'plugins' : '{baseplugins,config/plugins}'
2 2  
3 3 Dir.glob(Rails.root.join(plugins_root, '*', 'controllers')) do |controllers_dir|
4 4 prefixes_by_folder = {'public' => 'plugin',
... ...