Merge branch 'MDL-62274-master' of git://github.com/bmbrands/moodle
commitb043073143a1e87e38f92f5dedbb64c10bdaa98b
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 00:38:13 +0000 (8 08:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 May 2018 00:38:13 +0000 (8 08:38 +0800)
tree19380a8db31a1fce7ee07f8fad7ab99f5093b079
parentfc8cc24c8555792b9bd9268c65a1bd6b8abc1877
parent29587cc9da0766d163a2a9b6dc7746d2ac4de2a4
Merge branch 'MDL-62274-master' of git://github.com/bmbrands/moodle