Christophe Vilayphiou a2e35f3626 Merge branch 'master' into ldap		2012-04-13 16:03:57 +08:00
..
admin	Comment out code that bugged upload image in ad_banner	2012-04-13 15:53:25 +08:00
devise	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Announcement modifications and tags	2012-02-15 00:34:22 +08:00
layouts	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00