Merge branch 'MDL-68833-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 15:57:57 +0000 (17:57 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 3 Jun 2020 15:57:57 +0000 (17:57 +0200)
commitfa1a1733020d4db7558e1204f304b1ed65569f6f
treedc8178ecdae11ba4b90b224cb97bc4ea82344613
parent4106d2635443aaf023e4316964027a85709f2168
parent0e606192effe448857e359069ed8b14e5f52e5f7
Merge branch 'MDL-68833-master' of git://github.com/andrewnicols/moodle