mirror of
https://github.com/moodle/moodle.git
synced 2025-04-13 12:32:08 +02: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)