Christophe Vilayphiou ebc8dd33ec Merge branch 'design_team' into ldap ... Conflicts: Gemfile.lock app/controllers/admin/module_apps_controller.rb app/controllers/application_controller.rb vendor/built_in_modules/web_resource/web_resource.json		2012-05-14 00:57:17 +08:00
..
announcement	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00
news	Merge branch 'nccu_0509' of github.com:Rulingcom/orbit into nccu_0509	2012-05-14 00:51:53 +08:00
page_content	Add mongoid-tree to Item	2012-05-11 16:16:09 +08:00
web_resource	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00