Merge branch 'MDL-62269-master' of git://github.com/vmdef/moodle
commit270cefc4b090081320101d800e24606732eb71ee
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 10:32:54 +0000 (9 18:32 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:16:00 +0000 (10 09:16 +0800)
tree0fa786ecf0c2b2763c8b04b5a745adcbe5274ef5
parenta49a43853672b729ca1c9baa1e9a763f12b33172
parent5d5881f0f8f5630745e1b833cac83430358e87b7
Merge branch 'MDL-62269-master' of git://github.com/vmdef/moodle