Christophe Vilayphiou 308cfc7cf2 Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb		2012-04-24 02:46:06 +08:00
..
admin	Merge branch 'design_team' into ldap	2012-04-24 02:46:06 +08:00
devise	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
layouts	Merge branch 'design_team' into ldap	2012-04-24 02:37:03 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00