diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-02-06 15:30:54 +0000 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-02-06 15:30:54 +0000 |
| commit | 3fff90e4003ec003a5a49fd2e155c2cc220485c9 (patch) | |
| tree | c8df2ee7bcc49ffa2b7c0059e18fd0487ec40803 | |
| parent | 0f541e0cf80ba1135a2ae0ae34d53c7917dec23c (diff) | |
| parent | 4dc7b90212c8d97c7a7a043d4f3d7982feb897f2 (diff) | |
Merge branch 'develop' 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' |