Merge branch 'wip-MDL-61939-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 09:19:49 +0000 (17:19 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 23 Apr 2018 09:19:49 +0000 (17:19 +0800)
commitce447198b8c9d57ccb046a80815b66199e6970d1
tree45c317ff604203573ad5096ff8250dd41ed241ca
parent6de5bbb8cd63a32b059e2dfa0ac08751f305e297
parente8cf2ffd61b3edece03803fe6dd2dfcca91e6848
Merge branch 'wip-MDL-61939-master' of git://github.com/marinaglancy/moodle