Merge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 08:16:42 +0000 (16:16 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 12 Oct 2017 08:16:42 +0000 (16:16 +0800)
commitdab702d3941d2604a623ab54c86a69e335a49ebe
treec2e81e1e7ed168a977806c8d18d9d7f94db3ab86
parent42c7270eb1c0598d4a2279b03308df08cf79020a
parentb47fda71917f079e7655ee99bc59abf5cd2a47d9
Merge branch 'wip-MDL-60029-master' of git://github.com/marinaglancy/moodle