Merge branch 'MDL-62117-master-fix' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 01:34:37 +0000 (09:34 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 01:34:37 +0000 (09:34 +0800)
commit239c6202e2cff0eafd86a1cb5ad951ee0a9a014f
treea95a439a77e54d451d32b46d2d05b2f2febf5b5b
parente4ad3ee714a50942214b4b5b91cb44a24009c4b7
parent932ee52ba7c5b7489cf576c271ec0d125e2afbfc
Merge branch 'MDL-62117-master-fix' of git://github.com/andrewnicols/moodle