diff options
author | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
---|---|---|
committer | Julian Pawlowski <julian.pawlowski@gmail.com> | 2013-01-28 14:17:52 +0100 |
commit | 8aa7de2636dcd22781b623d5c9270f5ecf8b85c2 (patch) | |
tree | 1bb5dc36fb28c96ad9be9a2357d380c2c24ee31e /config/routes.rb | |
parent | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (diff) | |
parent | 600574759573e48da9f5f82d4ff8a863b6830c95 (diff) |
Merge branch 'develop'5.1-beta2
Diffstat (limited to 'config/routes.rb')
-rw-r--r-- | config/routes.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index 22a36e5..9d47efc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -224,8 +224,7 @@ Gemeinschaft42c::Application.routes.draw do resources :sessions get "page/index" - get "page/conference" - get "page/beginners_intro" + get "page/help" root :to => "page#index" |