Merge branch 'MDL-61394-master-fix' of git://git.cameron1729.xyz/moodle
commite63da7ba582e4b664c004e3b5f2ec3e35206c42c
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 20 Feb 2018 02:41:39 +0000 (20 10:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:55 +0000 (22 08:30 +0800)
tree9f004a8ed065a89724af6b435b853a4713443618
parent3a7ae79555a435c0582379d10b8bf3c2f137c375
parent40e53599b3121ce4e7119861bf04522eab28ac35
Merge branch 'MDL-61394-master-fix' of git://git.cameron1729.xyz/moodle