Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:19:00 +0000 (10:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:19:00 +0000 (10:19 +0800)
commit740a81eeb22697ea05d411259d583aef4f13cf50
tree8e78ddef40a0a8cc28701570ebaeee1868cf5e26
parent8cae0850712d44fb79fa897ca31a0bf954838165
parentb588373656f2f77b8ca7206ffd5c09ab8bc28ac8
Merge branch 'MDL-60968-master' of git://github.com/lameze/moodle