Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 00:55:57 +0000 (08:55 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 00:55:57 +0000 (08:55 +0800)
commit34adfcb4eeb73f022488c4540f53a75a6bf2054d
treef29b943de7a2ba3c1fc807adfe644e0d815e2af8
parent807ba44cc651897f6036f01af83b0b982cc8b5ed
parentd38173232916bb22882ba6d9663a7bf5f809b18a
Merge branch 'MDL-54021-master' of git://github.com/mihailges/moodle