Merge branch 'MDL-61305-master-fix' of https://github.com/andrewnicols/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 03:30:53 +0000 (11:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 03:30:53 +0000 (11:30 +0800)
commitf675a8e23a29763303f3c9995fdf9d9501aa3aa7
tree2b01930441713ae0cb75ddce281cdf2daeee1830
parentaf5f446fa85c83f09daa80ed413e84c972e7202a
parentada9d0fb69bc1752a93742991da187fe6eccd1e5
Merge branch 'MDL-61305-master-fix' of https://github.com/andrewnicols/moodle