Merge branch 'MDL-59733-master' of https://github.com/xow/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 21 Aug 2017 02:40:27 +0000 (10:40 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 21 Aug 2017 02:40:27 +0000 (10:40 +0800)
commit3a3530a8631309a69b4609f4939f87402e733407
tree8cf8182dc34bf1f81636298aaad996789f31de50
parent0f74ed29813b3083829a4210292cf7254082e058
parenta18b4799f29a326bd9ed0df9c1eb374e805890cc
Merge branch 'MDL-59733-master' of https://github.com/xow/moodle