Merge branch 'MDL-69146_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorSara Arjona <sara@moodle.com>
Thu, 8 Oct 2020 10:43:29 +0000 (12:43 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 8 Oct 2020 10:43:29 +0000 (12:43 +0200)

Trivial merge