Matt Fu 9a40ecd1d9 Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine ... Conflicts: app/views/devise/passwords/new.html.erb app/views/devise/sessions/new.html.erb		2012-02-29 13:07:21 +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	Change locales for orbit	2012-02-29 10:48:15 +08:00
rails.yml	Add asset model and controller	2010-02-01 17:24:28 +08:00
zh_tw.yml	Change locales for orbit	2012-02-29 10:48:15 +08:00