Merge branch 'MDL-68728-master-2' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:24:17 +0000 (20:24 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:24:17 +0000 (20:24 +0200)

Trivial merge