Merge branch 'MDL-71390-311' of git://github.com/marinaglancy/moodle into MOODLE_311_...
commit48ac131ee152fe98d35033a6c5bd06436f59b4ce
authorSara Arjona <sara@moodle.com>
Thu, 6 May 2021 06:02:59 +0000 (6 08:02 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 6 May 2021 06:02:59 +0000 (6 08:02 +0200)
tree6e337ca64872f65c9857dabdd0452bea284df8aa
parente0e5881c120a3549394358f462609055db971d14
parent1001a8fb25e7f057aab8902fc8f1cf8c09af3659
Merge branch 'MDL-71390-311' of git://github.com/marinaglancy/moodle into MOODLE_311_STABLE
lang/en/admin.php