Merge branch 'MDL-60880-master-fix1' of http://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Dec 2017 08:18:28 +0000 (16:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 7 Dec 2017 08:18:28 +0000 (16:18 +0800)
commitf017a30ff32e2976cf07e2c55dcaca6e1a63795a
tree05aaba7c6ffae99a03d1ef03af1c6132f9cb995c
parent4ffbf22046b4057e944acf9e988823ceab31bbd2
parent6f7daa5e48524184bc19d7d53957a2776770527b
Merge branch 'MDL-60880-master-fix1' of github.com/damyon/moodle