Merge branch 'MDL-60013-master-fix' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 17 Jul 2019 01:12:57 +0000 (09:12 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 17 Jul 2019 01:12:57 +0000 (09:12 +0800)
commitfa2d9e57dc0cdc2159004028161ca24ad6ce8488
tree19d292695d26b98d459130e230bbf0bf16d7a21c
parentc010001b90309a9c3bf37d202770f7cfb3e2e19e
parent8f3f25e21aa095759816779a126f0c46157b473e
Merge branch 'MDL-60013-master-fix' of git://github.com/andrewnicols/moodle