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
..
devise.en.yml	Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)	2011-04-13 18:19:51 +08:00
devise.zh_tw.yml	Chris's first commit at Fri Jan 28 2011 10:14:32 GMT+0800 (CST)	2011-04-13 18:19:51 +08:00
en.yml	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-16 12:13:07 +08:00
rails.yml	Add asset model and controller	2010-02-01 17:24:28 +08:00
zh_tw.yml	Merge branch 'design_team' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-16 12:13:07 +08:00