aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers/general_controller.rb
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-01-15 16:05:25 +0000
committerLouise Crow <louise.crow@gmail.com>2013-01-15 16:05:25 +0000
commitd1cac849b5c74e4f0d35b193ad24eed1d6b66af6 (patch)
treecb153b82b3e1d451be2d299b6114c99b6610b173 /app/controllers/general_controller.rb
parentf25df72186683e54dd10fd5aa94e1e26dff8ea92 (diff)
parent7cc8cae3a669fc5de91d6bc23812c265e8af4c93 (diff)
Merge branch 'release/0.6.9'
Diffstat (limited to 'app/controllers/general_controller.rb')
-rw-r--r--app/controllers/general_controller.rb6
1 files changed, 0 insertions, 6 deletions
diff --git a/app/controllers/general_controller.rb b/app/controllers/general_controller.rb
index 0cde238cd..3ba636e29 100644
--- a/app/controllers/general_controller.rb
+++ b/app/controllers/general_controller.rb
@@ -226,12 +226,6 @@ class GeneralController < ApplicationController
redirect_to request_url(info_request)
end
- # For debugging
- def fai_test
- sleep 10
- render :text => "awake\n"
- end
-
def custom_css
long_cache
@locale = self.locale_from_params()