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
..
assets	Merge branch 'master' of github.com:Rulingcom/NCCU	2012-09-28 09:49:22 +08:00
controllers	fix nccu login	2012-09-25 15:07:07 +08:00
helpers	Add missing translations	2012-09-24 09:02:46 +08:00
jobs	NCCU 上傳版本 0709	2012-07-09 16:02:59 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	add missing file	2012-09-10 14:23:45 +08:00
uploaders	Set default picture	2012-08-16 17:24:12 +08:00
views	fix i18n.file upload failed	2012-09-27 13:34:40 +08:00