Christophe Vilayphiou d4aea664e2 Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb		2012-04-24 02:37:03 +08:00
..
announcement	Merge branch 'design_team' into ldap	2012-04-24 02:37:03 +08:00
page_content	Merge branch 'dashboard' of github.com:Rulingcom/orbit into dashboard	2012-04-05 15:24:39 +08:00
web_resource	Merge branch 'ldap' of https://github.com/Rulingcom/orbit into ldap	2012-04-19 14:31:05 +08:00