developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	app/assets/javascripts/mobile/orbit.mobile.js.erb
	app/assets/stylesheets/mobile.css
	app/assets/stylesheets/mobile/orbit-mobile.css.erb
	app/controllers/application_controller.rb
	app/controllers/mobile_controller.rb
	app/views/layouts/mobile.mobile.erb
	app/views/mobile/_footer.mobile.erb
	app/views/mobile/_header.mobile.erb
	app/views/mobile/_menu.mobile.erb
	app/views/mobile/index.mobile.erb
	config/routes.rb
This commit is contained in:
chris committed 2013-01-14 17:46:27 +08:00
2 parents 141eb7e723 8ec0b35245
commit 282604d1fa
4 files changed
+2 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/application_controller.rb
+1 -1
View File
@@ -11,7 +11,7 @@ class ApplicationController < ActionController::Base
rescue_from PageError, :with => :render_page_error
layout :layout_by_resource
helper :admin, :orbit_form
before_filter :set_locale, :set_site, :prepare_for_mobile