Christophe Vilayphiou 47215693c4 Merge branch 'master' into ldap ... Conflicts: Gemfile Gemfile.lock config/application.rb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/widget/web_links_controller.rb		2012-03-19 14:27:15 +08:00
..
announcement	Merge branch 'master' into ldap	2012-03-19 14:27:15 +08:00
new_blog	Replace PrototypeR4 by Orbit.	2012-03-16 14:58:32 +08:00
page_content	fix dashboard & announcement	2012-03-16 14:44:57 +08:00
web_resource	Merge branch 'master' into ldap	2012-03-19 14:27:15 +08:00