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
..
admin	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
devise	Changes on nccu	2012-05-18 15:20:45 +08:00
js	Integrate Harry's modifications to reload pop-up content	2011-12-29 14:09:06 +08:00
kaminari	Fixed bugs for nccu	2012-05-22 20:00:07 +08:00
layouts	Merge branch 'design_team' into ldap	2012-05-22 20:33:07 +08:00
.swp	adding files not commited from previous commit	2011-07-12 16:02:41 +08:00