Merge branch 'MDL-57755_master' of https://github.com/t-schroeder/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 09:26:32 +0000 (10:26 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 09:26:32 +0000 (10:26 +0100)

Trivial merge