Merge branch 'MDL-37624-master-fix' of git://github.com/junpataleta/moodle
authorJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 08:40:29 +0000 (16:40 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 4 Jul 2018 08:40:29 +0000 (16:40 +0800)
commitf84e9c4ead21de40d445dfded974802f524cf1a1
tree8e47cfc3d55fcf8317b68b2fc70e799b7b7fe693
parent0b18d0c960c27994dd9870d286f2da3fa5868c06
parentd180b40066fa559792567bc667cb0504eb328024
Merge branch 'MDL-37624-master-fix' of git://github.com/junpataleta/moodle