Merge branch 'MDL-62886-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 12:25:26 +0000 (14:25 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 13 Aug 2018 12:25:26 +0000 (14:25 +0200)
commitbf19506dfb2c4dbd249247eadc8fc14a5b6d3eec
tree7db41f7b203c9d5f30d71de439c6b692916e1cf1
parent93e0b1593c0865a901bea02f39f5c3edf5862e44
parentfba3c3be8e0d7ec5f5c2f3d750d8a343baa14ba4
Merge branch 'MDL-62886-master' of https://github.com/lucaboesch/moodle