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
..
built_in_modules	Merge branch 'design_team' into ldap for NCCU 0229 demo on Redmine	2012-02-29 13:07:21 +08:00
plugins	Merge with sub_roles	2011-12-23 18:34:21 +08:00