Merge branch 'MDL-65829_master' of git://github.com/dmonllao/moodle
commite36bbb4c24ae2a6c6e430efda6d3d774ba6e9b09
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 02:20:15 +0000 (12 10:20 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Jun 2019 02:20:15 +0000 (12 10:20 +0800)
tree5bfd268ecf8104daa345c4aa594c484475eec245
parent1967e07175af5fa94f8680a50e33990a5807747a
parentc182a67fa01b0468b2fcd247ccddcce3f2834020
Merge branch 'MDL-65829_master' of git://github.com/dmonllao/moodle