Merge branch 'MDL-63439-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 22:47:40 +0000 (00:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 22:47:40 +0000 (00:47 +0200)
commit89957b6c34f550b51bb85f3b94e19a740198fc92
treec0ecac8d546a684ad553d9fff7207286bbcaf0ec
parent609c73be26d14dfe41c81bbfc98305e080c4f52a
parent490e48a4df1bba0ddc1376bcd3c8bf20e9460c4e
Merge branch 'MDL-63439-master' of git://github.com/damyon/moodle