mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 06:18:28 +01:00
6bf410ed4b
Conflicts: calendar/lib.php (MDL-36615) calendar/managesubscriptions_form.php (MDL-36352)