Merge branch 'MDL-60936_master' of git://github.com/dmonllao/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Mar 2019 06:50:46 +0000 (14:50 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Wed, 20 Mar 2019 06:50:46 +0000 (14:50 +0800)
commitb1869131cfc7f53fe5a4a89a605003db883bb077
tree2b7465823160a73f1491ead2b102da171f5a23b1
parentd08e28a3bb9c4ee3f28a17fd26b67c47d33d5cad
parent3576b66bfdf07612f3d477ba21796df5e70805f5
Merge branch 'MDL-60936_master' of git://github.com/dmonllao/moodle