Merge branch 'MDL-67471_master' of https://github.com/t-schroeder/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2020 22:54:35 +0000 (23:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Feb 2020 22:54:35 +0000 (23:54 +0100)

Trivial merge