diff options
| author | David Cabo <david@calibea.com> | 2012-02-05 23:49:15 +0100 |
|---|---|---|
| committer | David Cabo <david@calibea.com> | 2012-02-05 23:49:15 +0100 |
| commit | 4dc7b90212c8d97c7a7a043d4f3d7982feb897f2 (patch) | |
| tree | 3538fd919abe6565ed723146363ef4a3b25a20fc | |
| parent | 11782f45795dc8f57e5ca9666e8325976541120e (diff) | |
| parent | 84d601ae9fb50e595acaf9c5b0027a2b9bb71a66 (diff) | |
Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into develop
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index c4339209a..fa387a106 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -15,7 +15,7 @@ ActionController::Routing::Routes.draw do |map| # Keep in mind you can assign values other than :controller and :action # Allow easy extension from themes. Note these will have the highest priority. - require File.join(Rails.root, 'config', 'custom-routes') + require File.join('config', 'custom-routes') map.with_options :controller => 'general' do |general| general.frontpage '/', :action => 'frontpage' |