Orbit/app
Matthew K. Fu JuYuan a31a9c4792 Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509
Conflicts:
	app/controllers/admin/object_auths_new_interface_controller.rb
	app/helpers/application_helper.rb
	app/models/ad_banner.rb
2012-05-16 12:13:07 +08:00
..
assets Change assets 2012-05-16 11:07:11 +08:00
controllers Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-16 12:13:07 +08:00
helpers Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-16 12:13:07 +08:00
jobs Restart job 2012-05-14 00:50:36 +08:00
mailer Add mail_settings 2012-05-09 11:38:29 +08:00
models Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-16 12:13:07 +08:00
uploaders Change assets 2012-05-16 11:07:11 +08:00
views Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509 2012-05-16 12:13:07 +08:00