This repository has been archived on 2024-03-16. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Merge branch 'master' into ldap	2012-03-19 14:27:15 +08:00
helpers	merge with master	2012-01-11 20:31:52 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	add new files	2012-03-19 10:55:58 +08:00
views	Merge branch 'master' into ldap	2012-03-19 14:27:15 +08:00