Matthew K. Fu JuYuan 2cd67356a5 Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509 ... Conflicts: config/locales/zh_tw.yml		2012-05-14 12:36:09 +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	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
rails.yml	Add asset model and controller	2010-02-01 17:24:28 +08:00
zh_tw.yml	Merge branch 'nccu_0509' of https://github.com/Rulingcom/orbit into nccu_0509	2012-05-14 12:36:09 +08:00