Merge branch 'MDL-59665_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 05:53:19 +0000 (13:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 7 Aug 2017 05:53:19 +0000 (13:53 +0800)
commitc9d781d207dc29f18a27d888e0f81778461c3a9a
treeaf4bd3534216c8d7ac523c21790cb4b0c2e155cf
parent36f207ec43ea16f4064fcf39869d5b4141be574e
parent805b667c3a96aacb009176ae2d4db90feb4b7a35
Merge branch 'MDL-59665_master' of git://github.com/dmonllao/moodle