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
..
_app_selector.html.erb	LDAP with sync rake task	2012-03-06 16:41:06 +08:00
edit.html.erb	Announcement preivew	2012-05-04 15:50:45 +08:00
index.html.erb	creating for disabling widgets and frontend	2012-01-05 16:21:33 +08:00
reload_frontend_pages.js.erb	Add category and tag to pages	2012-05-14 00:33:52 +08:00
show.html.erb	Exp with object_auth	2012-02-29 18:50:23 +08:00