Matt Fu 7f05f21930 Merge commit '7c55f6fb8850ef426978dd422fa782358f9ec2fe' into ldap ... Conflicts: config/environments/development.rb		2012-03-01 10:13:49 +08:00
..
devise.en.yml	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
devise.zh_tw.yml	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
en.yml	Changes for nccu	2012-02-29 16:01:50 +08:00
rails.yml	Add asset model and controller	2010-02-01 17:24:28 +08:00
zh_tw.yml	Changes for nccu	2012-02-29 16:01:50 +08:00