This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap ... Conflicts: Gemfile app/models/ad_banner.rb		2012-05-15 23:02:22 +08:00
..
admin	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00
devise	Merge branch 'design_team' into ldap	2012-04-30 07:57:20 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
layouts	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00