Merge branch 'MDL-69900-310' of git://github.com/mihailges/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 11:41:59 +0000 (13:41 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 19 Oct 2020 11:41:59 +0000 (13:41 +0200)

Trivial merge