Merge my local branch, bring back xmlrpc

[selectricity-live] / app / controllers / application.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index a5bb1085361dbdd7f9169c2d1a2d442384a15d3d..8c6f8aeabfc803bbd538516f06365afe69e90578 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -5,4 +5,5 @@ class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   helper :user
   model :user
   include AuthenticatedSystem
   helper :user
   model :user

+  

 end
 end