Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 04:05:21 +0000 (12:05 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 28 Nov 2017 04:05:21 +0000 (12:05 +0800)
commit2c3d8a06c8ebbb9f16b1370d8ef781047f2d16f6
treef0b1a17d10b16466736a504acbcf13f22bf81fc7
parentbdb157653b8e93a81169e198e62b295f5b02343d
parent9bd6807635d4d2cf384c6b27c67ac60d26e39065
Merge branch 'MDL-60669-master' of git://github.com/tobiasreischmann/moodle