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 1f4fe65430 Merge branch 'design_team' into ldap ... Conflicts: app/views/devise/sessions/new.html.erb vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/fact_checks/_privilege_user.html.erb		2012-04-25 16:45:04 +08:00
..
fonts	Ray's changes in announcenment back-end	2012-03-27 18:58:03 +08:00
images	Ray's changes for css files, sort headers in announcement and pagination	2012-04-24 02:37:51 +08:00
javascripts	Change ad_banner preview from using title to id	2012-04-25 16:10:11 +08:00
stylesheets	Merge branch 'design_team' into ldap	2012-04-25 16:45:04 +08:00