Matthew K. Fu JuYuan aa5d0bb1ad Merge branch 'master' of github.com:Rulingcom/NCCU ... Conflicts: config/locales/zh_tw.yml		2012-09-28 09:49:22 +08:00
..
devise.en.yml	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
devise.zh_tw.yml	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
en.yml	fix i18n	2012-09-27 11:03:08 +08:00
rails.yml	Add asset model and controller	2010-02-01 17:24:28 +08:00
social_share_button.en.yml	first version of fb_share	2012-08-08 11:04:19 +08:00
social_share_button.zh-tw.yml	first version of fb_share	2012-08-08 11:04:19 +08:00
zh_tw.yml	Merge branch 'master' of github.com:Rulingcom/NCCU	2012-09-28 09:49:22 +08:00