diff options
| author | Louise Crow <louise.crow@gmail.com> | 2012-11-20 15:30:40 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2012-11-20 15:30:40 +0000 |
| commit | 766da660994dbe7c86f556d9cf863411814622fe (patch) | |
| tree | 9adc0ef695cb076216e8ebb15ab29b56ef9bbf15 /app/controllers/general_controller.rb | |
| parent | 8b4003f7fce9e089f2220e6f1a21681f7cf2df3d (diff) | |
| parent | 21f4341619ae1b076521e04f2124ef86fd2b7b5f (diff) | |
Merge remote-tracking branch 'origin/develop' into wdtk
Diffstat (limited to 'app/controllers/general_controller.rb')
| -rw-r--r-- | app/controllers/general_controller.rb | 6 |
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() |