Merge branch 'MDL-62366-master' of git://github.com/zig-moodle/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:13:44 +0000 (18:13 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 10 May 2018 16:13:44 +0000 (18:13 +0200)
commit1f000f071ef04c8eca5881151cd7a0d36c849b60
tree3c0a2cdd9f91bb9b1c0e55384383e5e798d1f6bd
parent4033c2a11b61c15705f4c1dbb1ed9002f1a19645
parent0139b8828fb6b53d3844035155f16efd8a4bc631
Merge branch 'MDL-62366-master' of git://github.com/zig-moodle/moodle