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 70f6c7b540 Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb		2012-04-24 15:28:52 +08:00
..
permission-checkbox.css.erb	Ray's changes for image upload component and sign-in page	2012-04-24 11:35:50 +08:00
permission-checkbox.css.erb.css	Merge branch 'master' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:06:00 +08:00