diff options
| author | Azul <azul@leap.se> | 2013-01-25 19:26:51 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2013-01-25 19:26:51 +0100 |
| commit | 9563ed191556e739c8f99be4d0fc75ac31c8f6cd (patch) | |
| tree | 5a87fc1947921766a5430896f4bcf531dc396bff /app | |
| parent | 77a51e1de520299afd2b33e7a3992aaafab1d6ae (diff) | |
| parent | dac578781baf73a006cc78e29588dd1f6fdc0fd3 (diff) | |
Merge branch 'master' into merge_leap_ca
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index be7aa1f..06b245a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,5 @@ class ApplicationController < ActionController::Base protect_from_forgery ActiveSupport.run_load_hooks(:application_controller, self) + end |