summaryrefslogtreecommitdiff
path: root/app/controllers/page_controller.rb
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2012-12-31 08:50:27 +0100
committerspag <spag@golwen.net>2012-12-31 08:50:27 +0100
commitaed84444142604a62e37e57acfaaf957219e2c8d (patch)
treee00b1f5844590393171e0bc839ab516d39f5144d /app/controllers/page_controller.rb
parentc24bd3a8212e85894b2f7c26e190fe5e89fbaaf2 (diff)
parent12c8f4c82770ded6ea6b519e4451ed6757419ddf (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.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/page_controller.rb b/app/controllers/page_controller.rb
index 1f37449..4ea4d25 100644
--- a/app/controllers/page_controller.rb
+++ b/app/controllers/page_controller.rb
@@ -7,6 +7,7 @@ class PageController < ApplicationController
def index;end
def conference;end
+ def beginners_intro;end
private
def if_fresh_system_then_go_to_wizard