Merge branch 'MDL-62023-master' of git://github.com/bmbrands/moodle
commit4450d19ae11c083c89c4275c9efb6df58817469c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2018 16:15:41 +0000 (23 18:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2018 16:15:41 +0000 (23 18:15 +0200)
treed3c10c6cfbc453bf7a50494589a6ec32073734c1
parent3d7b805f4e5c4b903af358d406f97cd5a09a2c71
parent03b06309e2f12a843a31ad0eeccd02a1d811c022
Merge branch 'MDL-62023-master' of git://github.com/bmbrands/moodle