Merge branch 'MDL-62983-master' of git://github.com/sarjona/moodle
commitd7978b17403a51761eb23bac8854b8c7d864fd01
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Aug 2018 03:17:13 +0000 (2 11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 2 Aug 2018 03:17:13 +0000 (2 11:17 +0800)
treed6bfa34b32ac6aba9470f65b0305103d83dc771d
parentd8971be88f865404b0b14db08253d8c067625eba
parent89e27d9999087db1feae99c84731ae3a87371816
Merge branch 'MDL-62983-master' of git://github.com/sarjona/moodle