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	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
helpers	Remove seconds from date display	2012-05-22 20:19:04 +08:00
jobs	Nccu calendar and daily job.	2012-05-15 14:03:54 +08:00
mailer	Add mail_settings	2012-05-09 11:38:29 +08:00
models	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
uploaders	Comment out filename in FIleAssetUploader	2012-05-17 23:34:15 +08:00
views	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00