orbit-basic/vendor
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
..
built_in_modules Merge branch 'design_team' into ldap 2012-05-14 00:57:17 +08:00
plugins Merge with sub_roles 2011-12-23 18:34:21 +08:00