Merge branch 'new_member' of github.com:Rulingcom/orbit into new_member

Conflicts: app/controllers/application_controller.rb app/views/layouts/_side_bar.html.erb
2012-09-14 00:03:52 +08:00 · 2012-09-14 00:03:52 +08:00 · 03b5827392
parent df6c7afd68 669220530d
commit 03b5827392
1 changed files with 1 additions and 1 deletions
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
  protect_from_forgery
-  
+
  include ParserFrontEnd, ParserBackEnd, ApplicationHelper
  
  layout :layout_by_resource