Christophe Vilayphiou de739d7d20 Merge branch 'design_team' into ldap ... Conflicts: vendor/built_in_modules/web_resource/web_resource.json		2012-05-10 00:34:23 +08:00
..
assets	Ika's changes	2012-02-23 15:53:15 +08:00
controllers	Merge branch 'design_team' into ldap	2012-05-10 00:34:23 +08:00
helpers	fix wrong link	2012-05-09 15:54:00 +08:00
mailers	merge with master	2012-01-11 20:31:52 +08:00
models	add field called unit_list_for_anc and data from nccu(0224). Now can run "rake nccu_data:setup_ut_list" to setup NCCU data.	2012-05-04 15:50:45 +08:00
views	Merge branch 'design_team' into ldap	2012-05-10 00:34:23 +08:00