Merge branch 'MDL-70763-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE
commit2e877cd448829a22aa267d1626de5bf86f8b0cfd
authorSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 10:36:30 +0000 (28 12:36 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 28 Apr 2021 10:36:30 +0000 (28 12:36 +0200)
tree5f4aa79a21bca6847840798ef4c140e94a09dba1
parent7fae164d47c74d13532b0a3645ad2d1155ead7b8
parent969114e23dbe77bad532b587c06242c4da655320
Merge branch 'MDL-70763-311' of git://github.com/paulholden/moodle into MOODLE_311_STABLE