Merge branch 'MDL-61290_master' of https://github.com/aanabit/moodle
commit77f9983189568d4ceac592734c2ed62019ec7ae5
authorDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 15:18:17 +0000 (31 17:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 31 Jul 2018 15:18:17 +0000 (31 17:18 +0200)
tree5f99b24f8db6d1cc8ca475df9fa23deb287656c4
parentf967e6795da39ad355c66ce95abda9f38aaeaa71
parent4a6cd05ae1b16112d9b0180fa94fde101a203b93
Merge branch 'MDL-61290_master' of https://github.com/aanabit/moodle