Christophe Vilayphiou d88d4e58dc Merge branch 'design_team' into ldap ...

Conflicts:
	config/environments/development.rb

2012-05-09 13:51:00 +08:00

..

permission-checkbox.css.erb

Ray's changes for front-end banner

2012-05-08 17:21:26 +08:00

permission-checkbox.css.erb.css

Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap

2012-04-19 14:06:00 +08:00