Merge branch 'MDL-54742-master' of git://github.com/mihailges/moodle
commita6034c9611514418d39983ac6520504f581794dd
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 06:29:55 +0000 (23 14:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Jul 2018 06:29:55 +0000 (23 14:29 +0800)
tree160c1dfd8ff0c21a40cbf1b0b98e1b474daa8ae1
parent653c30708dbff7845ad7354a38a2cd838af47c13
parent10bd37fabd77f35075ef01821589893b99fa72dc
Merge branch 'MDL-54742-master' of git://github.com/mihailges/moodle