saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Christophe Vilayphiou 2012-09-14 00:03:52 +08:00
parent df6c7afd68 669220530d
commit 03b5827392
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@ -1,6 +1,6 @@
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
protect_from_forgery protect_from_forgery
include ParserFrontEnd, ParserBackEnd, ApplicationHelper include ParserFrontEnd, ParserBackEnd, ApplicationHelper
layout :layout_by_resource layout :layout_by_resource