Christophe Vilayphiou f950f77f36 Merge branch 'design_team' into ldap ... Conflicts: Gemfile app/models/ad_banner.rb		2012-05-15 23:02:22 +08:00
..
assets	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00
helpers	Add impressionist	2012-05-15 21:26:09 +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-15 23:02:22 +08:00
uploaders	Modifications for images in html code	2011-10-18 11:21:24 +08:00
views	Merge branch 'design_team' into ldap	2012-05-15 23:02:22 +08:00