mirror of
https://github.com/moodle/moodle.git
synced 2025-03-17 14:10:08 +01:00
Conflicts: calendar/lib.php (MDL-36615) calendar/managesubscriptions_form.php (MDL-36352)
Conflicts: calendar/lib.php (MDL-36615) calendar/managesubscriptions_form.php (MDL-36352)