Merge branch 'MDL-62319-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 21:54:51 +0000 (23:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 21:54:51 +0000 (23:54 +0200)
commitbbfda3b9dbc5c9d8343eb02e944fabcef20b3f26
treee937bd44481e50a1690ce5f778d6f9344e233bd4
parent12752c72d1358c2644e0255b8a9ec6ab195563f1
parenta0b009115ec466e693c061789951fe7c8d05127d
Merge branch 'MDL-62319-master' of git://github.com/damyon/moodle