Christophe Vilayphiou 5a423178e3 Merge branch 'design_team' into ldap ...

Conflicts:
	app/assets/stylesheets/new_admin.css.erb
	app/assets/stylesheets/widget.css

2012-04-23 15:16:50 +08:00

..

assets

Merge branch 'design_team' into ldap

2012-04-23 15:16:50 +08:00

controllers

Merge branch 'master' into ldap

2012-04-23 14:13:37 +08:00

helpers

changes before Chirs and Ray's trip

2012-04-19 11:50:54 +08:00

models

Merge branch 'master' into ldap

2012-04-23 14:13:37 +08:00

uploaders

Modifications for images in html code

2011-10-18 11:21:24 +08:00

views

Merge branch 'master' into ldap

2012-04-23 14:13:37 +08:00