Merge branch 'MDL-64198-master' of https://github.com/lucaboesch/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 5 Dec 2018 06:30:16 +0000 (14:30 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 5 Dec 2018 06:30:16 +0000 (14:30 +0800)
commitccf5f091035b0629ca8ba8a7d80d125e312515e4
treeec1d88811e32fab153bc1a9cb94adeaa51087ad5
parentfcebc9b04298ac558fde9c0a2253255f9543399e
parentc21b42e76a9baa375fe8578ff4665973df1ceb3c
Merge branch 'MDL-64198-master' of https://github.com/lucaboesch/moodle