Commit Graph

5 Commits

Author SHA1 Message Date
Harry Bomrah 366876ae29 Merge branch 'master' of gitlab.tp.rulingcom.com:saurabh/orbit4-5 into nccu
Conflicts:
	app/assets/stylesheets/lib/orbit_bar/orbit-bar.scss.erb
2015-03-13 17:10:52 +08:00
rulingcom e045025bc6 precompile fixes for orbit mobile template 2015-03-06 17:59:30 +08:00
nccu 2c6bdd4bac nccu branch 2014-11-07 16:06:50 +08:00
Ray df934ae584 desktop mods
Conflicts:
	config/routes.rb
2014-08-08 18:08:26 +08:00
Harry Bomrah ec27f3f0e3 site structure now functional with create delete and edit page 2014-04-11 19:47:43 +08:00