Merge branch 'MDL-61394-master-fix2' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 20 Feb 2018 07:00:54 +0000 (15:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:56 +0000 (08:30 +0800)
commitf52c05d66deaca5af702dd9349cc51729bab6409
tree5ac9f0eeafef228e262b20f31ae1f2f2b0147221
parente63da7ba582e4b664c004e3b5f2ec3e35206c42c
parent54fd1bb3faa62483018a9ba8b2c9c4405bc8e4de
Merge branch 'MDL-61394-master-fix2' of git://github.com/andrewnicols/moodle