diff options
| author | spag <spag@golwen.net> | 2013-01-24 15:37:24 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-24 15:37:24 +0100 |
| commit | 99270421d02b3ac77bf111bbde62a2ef80f8e114 (patch) | |
| tree | 6ddb8328729e53dcc7a605040cd7aece622d0e5a /app/controllers/page_controller.rb | |
| parent | 5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff) | |
| parent | 2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/controllers/page_controller.rb')
| -rw-r--r-- | app/controllers/page_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb index dc5f57b..8f4fa88 100644 --- a/app/controllers/page_controller.rb +++ b/app/controllers/page_controller.rb @@ -11,8 +11,9 @@ class PageController < ApplicationController end end - def conference;end - def beginners_intro;end + def help + + end private def if_fresh_system_then_go_to_wizard |