Merge branch 'wip-MDL-23545-master' of https://github.com/Beedell/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 18 Sep 2018 01:47:38 +0000 (09:47 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 18 Sep 2018 01:47:38 +0000 (09:47 +0800)
commit3d2659097e865c0d15a3ae70fd432543f3e5041f
treefcd394fe7e9cffe5767df5b4a31c57f3699ea273
parent044e343bbd05a4926027279e5eb1cea5e20ee56b
parent1dab8faafdfccec991e81bb0da7e647a44abf7a0
Merge branch 'wip-MDL-23545-master' of https://github.com/Beedell/moodle