Christophe Vilayphiou 59b55d1574 Merge branch 'design_team' into ldap		2012-05-14 12:42:06 +08:00
..
assets	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-14 12:42:06 +08:00
helpers	Change to apply page to had object_auth	2012-05-14 12:40:50 +08:00
jobs	Restart job	2012-05-14 00:50:36 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'design_team' into ldap	2012-05-14 12:42:06 +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-05-14 12:42:06 +08:00