Merge branch 'MDL-63426-master' of https://github.com/lucaboesch/moodle
commit7c137e7845a1987bb8561876c6a7e9cb09812614
authorJun Pataleta <jun@moodle.com>
Wed, 3 Oct 2018 07:25:22 +0000 (3 15:25 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 3 Oct 2018 07:25:22 +0000 (3 15:25 +0800)
tree8244752b38d31cabc0ca7472162d82f6972e47b1
parent941b90a509b19eed7377055012161e9731cd8835
parentc789dd4f554884492bf012188ed0396910c78431
Merge branch 'MDL-63426-master' of https://github.com/lucaboesch/moodle