Merge branch 'wip-MDL-62526-master' of git://github.com/marinaglancy/moodle
commitab044c6cd595c4af68f3fb06a5a2f807b7ee5913
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jul 2018 02:19:12 +0000 (4 04:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 4 Jul 2018 02:19:12 +0000 (4 04:19 +0200)
tree111e899a7c01ef50de101802991952df4797442d
parent720d5b3b8559a97b7d6dd77351fb8d1cd8890f14
parent6e40d1edfea6ee38013295d688ebf0ba32eb5a75
Merge branch 'wip-MDL-62526-master' of git://github.com/marinaglancy/moodle