Merge branch 'MDL-62393-master' of git://github.com/andrewnicols/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 14 May 2018 01:37:34 +0000 (09:37 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 14 May 2018 01:37:34 +0000 (09:37 +0800)
commite995166863b17e756add7b69f557ed2916845020
tree81a405ffe9e9562e9737ccbfc07fa7b51af2ed17
parenta890f2ecfa8d2e4513c9838044c09afd68e92a80
parent823e08bf9d5e6aa8d6ed144a557036405326f3f2
Merge branch 'MDL-62393-master' of git://github.com/andrewnicols/moodle