Christophe Vilayphiou f1c8bed29d Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/news/app/controllers/panel/news/back_end/news_approvals_controller.rb vendor/built_in_modules/news/app/views/panel/news/back_end/news_bulletins/_news_bulletin.html.erb		2012-05-22 20:33:07 +08:00
..
assets	Changes for widgets	2012-05-13 21:55:39 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
helpers	Proof authed_users for case when no category	2012-05-18 10:50:51 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
views	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00