Christophe Vilayphiou a2e35f3626 Merge branch 'master' into ldap

2012-04-13 16:03:57 +08:00

..

assets

Comment out code that bugged upload image in ad_banner

2012-04-13 15:53:25 +08:00

controllers

Merge branch 'master' into ldap

2012-04-12 18:50:48 +08:00

helpers

Fix side_bar.

2012-04-12 18:14:00 +08:00

models

Merge branch 'master' into ldap

2012-04-12 18:50:48 +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-13 16:03:57 +08:00