summaryrefslogtreecommitdiff
path: root/config/routes.rb
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-24 15:37:24 +0100
committerspag <spag@golwen.net>2013-01-24 15:37:24 +0100
commit99270421d02b3ac77bf111bbde62a2ef80f8e114 (patch)
tree6ddb8328729e53dcc7a605040cd7aece622d0e5a /config/routes.rb
parent5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff)
parent2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'config/routes.rb')
-rw-r--r--config/routes.rb3
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"