Merge branch 'MDL-62266-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 04:33:40 +0000 (12:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 May 2018 04:33:40 +0000 (12:33 +0800)
commit88ab001b25911bd2e7bb2e4a72af3522f5508d9c
tree54fe16bfe15ffe175bc395b688f55495bb1a3465
parentdb65b0918872def0f7a8dd178add64f6ef04fd9d
parentedbee4c4b6498feddbd7f57bddb4095d5a51f4b0
Merge branch 'MDL-62266-master' of git://github.com/sarjona/moodle