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	edit tags	2012-02-15 15:38:27 +08:00
controllers	Merge branch 'master' into ldap	2012-04-12 18:50:48 +08:00
helpers	edit tags	2012-02-15 15:38:27 +08:00
mailers	edit tags	2012-02-15 15:38:27 +08:00
models	Widget for announcement and web_link with ajax reload and pagination	2012-02-20 08:34:36 +08:00
views	fix announcement & add lang tab	2012-04-05 15:23:20 +08:00