1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 19:42:56 +01:00
Aparup Banerjee 6bf410ed4b Merge branch 'MDL-36614-master' of git://github.com/ankitagarwal/moodle
Conflicts:
	calendar/lib.php (MDL-36615)
	calendar/managesubscriptions_form.php (MDL-36352)
2012-11-21 10:29:04 +08:00
..