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
..
edit.html.erb	LDAP connection and modified Devise	2012-02-22 14:43:24 +08:00
new.html.erb	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00