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
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00
helpers	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	New Interface for App Auth and Object Auth	2012-05-14 00:50:12 +08:00
views	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00