Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap ... Conflicts: config/environments/development.rb		2012-05-09 13:51:00 +08:00
..
fonts	Fix css bugs (opacity=) and changes in sign_in page	2012-04-27 15:27:59 +08:00
images	Merge branch 'design_team' of github.com:Rulingcom/orbit into design_team	2012-05-08 17:24:40 +08:00
javascripts	Ray's changes	2012-05-09 04:15:02 +08:00
stylesheets	Merge branch 'design_team' into ldap	2012-05-09 13:51:00 +08:00