Merge branch 'MDL-68778-master' of git://github.com/andrewnicols/moodle
commit69d5a63b9748e3c69612545eda0a71d895e523ec
authorSara Arjona <sara@moodle.com>
Wed, 20 May 2020 09:47:27 +0000 (20 11:47 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 20 May 2020 09:47:27 +0000 (20 11:47 +0200)
tree3d57f4b92243930b853ce6fdac465b992a6f55ff
parenta7431ec3f1c8f0e40572a535b6b44423db6476d0
parentfb4f19af80b55021e1fc161d66c8f64340afe15d
Merge branch 'MDL-68778-master' of git://github.com/andrewnicols/moodle