Merge branch 'MDL-63352-master' of git://github.com/peterRd/moodle
commit2debe416c65699638904e12968f92f2af91901dd
authorDamyon Wiese <damyon@moodle.com>
Mon, 15 Oct 2018 06:50:10 +0000 (15 14:50 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 15 Oct 2018 06:50:10 +0000 (15 14:50 +0800)
treea1b079a5f6126c3473fa8df89944c369d4e100ac
parent283acb8b223dcf6739e317268a9807db33a78508
parent9e95193e9fd0ac9a69ce6c7573c97017e6565034
Merge branch 'MDL-63352-master' of git://github.com/peterRd/moodle