Merge branch 'MDL-62253-master' of git://github.com/FMCorz/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:53:43 +0000 (13:53 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 2 May 2018 05:53:43 +0000 (13:53 +0800)
commit1b356275705d4c89dd01f771ab018369edd79de5
tree0356cdd4978d2af70aab87cc3c20cb08e2290fd9
parentc39c3edb8ed8b2ba32fea95476363c9360e9b2e6
parent1582d54bb0556a6c401c7b7f7c8fe8e0d74531cf
Merge branch 'MDL-62253-master' of git://github.com/FMCorz/moodle