mirror of
https://github.com/moodle/moodle.git
synced 2025-01-19 14:27:22 +01:00
19226a309f
Conflicts: admin/settings/badges.php lib/db/upgrade.php version.php