Merge branch 'MDL-67791-master' of git://github.com/ferranrecio/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Mon, 18 May 2020 03:55:36 +0000 (11:55 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Mon, 18 May 2020 03:55:36 +0000 (11:55 +0800)

Trivial merge