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

..

assets

Merge branch 'design_team' into ldap

2012-04-24 02:46:06 +08:00

controllers

Merge branch 'design_team' into ldap

2012-04-24 02:37:03 +08:00

helpers

Fix side_bar for tags

2012-04-23 16:12:07 +08:00

models

Merge branch 'design_team' into ldap

2012-04-24 02:37:03 +08:00

uploaders

Modifications for images in html code

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

views

Merge branch 'design_team' into ldap

2012-04-24 02:46:06 +08:00