Merge branch 'MDL-61751-master-fix' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 01:10:32 +0000 (09:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Apr 2018 01:10:32 +0000 (09:10 +0800)
commitb9201e1b2b4fb43c1d21cb4b01c3818980cb138b
treee2dcccd019c3628362b19c9692a4d1fb960da98b
parent711c4775c578023e6306406cc3399a33e948655a
parent0fe269291e17f7ee9b60f170938008b802ace74b
Merge branch 'MDL-61751-master-fix' of https://github.com/snake/moodle