Christophe Vilayphiou 198825a309 Merge branch 'master' into ldap ... Conflicts: Gemfile Gemfile.lock app/views/admin/attributes/_app_selector.html.erb app/views/admin/module_apps/_app_selector.html.erb app/views/admin/pages/_app_selector.html.erb vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb		2012-04-12 18:50:48 +08:00
..
assets	Ray's fix for announcement list	2012-04-12 18:41:14 +08:00
controllers	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
helpers	Fix side_bar.	2012-04-12 18:14:00 +08:00
models	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00