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

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

2013-01-14 17:46:27 +08:00

..

fonts

Change icons

2013-01-09 21:17:50 +08:00

images

Add mobile but remove news in it

2013-01-07 03:03:38 +08:00

javascripts

Add mobile but remove news in it

2013-01-14 17:38:44 +08:00

stylesheets

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

2013-01-14 17:46:27 +08:00