Merge branch 'MDL-44667-master' of https://github.com/snake/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 02:26:08 +0000 (10:26 +0800)
commit39377f808336d0374a7789313dc56fcb1514d427
tree9d914e992df38ed30f45dbd48772aa29760706bb
parent740a81eeb22697ea05d411259d583aef4f13cf50
parent3112c22004aad3a88c1d6825489beb0ff7d1a78b
Merge branch 'MDL-44667-master' of https://github.com/snake/moodle