aboutsummaryrefslogtreecommitdiffstats
path: root/config/routes.rb
diff options
context:
space:
mode:
authorRobin Houston <robin.houston@gmail.com>2012-06-05 12:42:27 +0100
committerRobin Houston <robin.houston@gmail.com>2012-06-05 12:42:27 +0100
commit5310c55e01d42cebbe7ede9e9a42e8f4dacc90d9 (patch)
treeb77413f0f0b18dd68a0bb1a242b1ca9693ec12f7 /config/routes.rb
parent505fdbf99ee322aab2c753dc3215a263171c9463 (diff)
parent0b10c9002481d80d4a70ca224fc49aa5970c6294 (diff)
Merge branch 'wdtk' into develop
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb
index c0d65042c..814deb760 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,9 @@
# $Id: routes.rb,v 1.92 2009-10-14 22:01:27 francis Exp $
# Allow easy extension from themes. Note these will have the highest priority.
-load File.join('config', 'custom-routes.rb')
+$alaveteli_route_extensions.each do |f|
+ load File.join('config', f)
+end
ActionController::Routing::Routes.draw do |map|