summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-01-25 11:46:22 +0100
committerAzul <azul@leap.se>2013-01-25 11:46:22 +0100
commitdac578781baf73a006cc78e29588dd1f6fdc0fd3 (patch)
treea56ecff398a87efdd4840a8fc897d6471fbdaa69 /app/controllers
parent75442ad26f3d30519f747bc98bc83cdc76aff750 (diff)
parent9d053b6c9b61c68bf11f95bcb37631a518f1fba4 (diff)
Merge branch 'feature/webfinger' of https://github.com/leapcode/leap_web
Conflicts: users/app/views/users/edit.html.haml
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb1
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