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
..
fonts	Fix css bugs (opacity=) and changes in sign_in page	2012-04-27 15:27:59 +08:00
images	Changes in page_edit	2012-05-13 20:13:26 +08:00
javascripts	Changes for widgets	2012-05-13 21:55:39 +08:00
stylesheets	Merge branch 'design_team' into ldap	2012-05-14 00:57:17 +08:00