Merge branch 'MDL-68935-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Mon, 28 Sep 2020 09:41:01 +0000 (11:41 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 28 Sep 2020 09:41:01 +0000 (11:41 +0200)

Trivial merge