Merge branch 'MDL-65680_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 May 2019 00:42:40 +0000 (08:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 27 May 2019 00:42:40 +0000 (08:42 +0800)
commitfb33169a05dfb78b151b1bb7c3d85e80699f2875
tree642a5337e2fc719abd444d00ccd42d39f15d0582
parentd68718a7db6a14f6e76c6e13e0f7b7258e8143a0
parent73f8085f3f30ff45c157805bba64ab9ea2594495
Merge branch 'MDL-65680_master' of git://github.com/dmonllao/moodle