Merge branch 'MDL-71420_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE
commit8880be478c6d4f9c396ce1e86b273333891f0912
authorSara Arjona <sara@moodle.com>
Thu, 6 May 2021 15:58:14 +0000 (6 17:58 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 6 May 2021 15:58:14 +0000 (6 17:58 +0200)
tree70913b0b8e940d83f97f27b26925929eb8358e30
parentb604c157558d76d628d4648027fca3a235455516
parentf7aa32f2a6d699179b24e3b799ed8caf5e31f724
Merge branch 'MDL-71420_311' of https://github.com/stronk7/moodle into MOODLE_311_STABLE
admin/environment.xml
lib/upgrade.txt