Merge branch 'MDL-68654-master' of https://github.com/catalyst/moodle
commit1d2d4782da22baa0ebe5b2d4bb0864805cd028eb
authorSara Arjona <sara@moodle.com>
Mon, 11 May 2020 17:16:14 +0000 (11 19:16 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 11 May 2020 17:16:14 +0000 (11 19:16 +0200)
treef58b2a3132b4daae5654215fbaac6182e672de2a
parent6165110f0a591a4cc6f30d79b761335985f0c0de
parent774bd482fd786b97d409671172ae1f53b039d8c4
Merge branch 'MDL-68654-master' of https://github.com/catalyst/moodle