Merge branch 'MDL-67126_master' of https://github.com/ffhs/moodle
authorSara Arjona <sara@moodle.com>
Thu, 21 May 2020 11:34:59 +0000 (13:34 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 21 May 2020 11:34:59 +0000 (13:34 +0200)

Trivial merge