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
..
fonts	Ray's changes in announcenment back-end	2012-03-27 18:58:03 +08:00
images	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
javascripts	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-04-24 02:44:39 +08:00
stylesheets	Merge branch 'design_team' into ldap	2012-04-24 02:46:06 +08:00