Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:59:50 +0000 (11:59 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 12 Dec 2017 03:59:50 +0000 (11:59 +0800)
commit59be445c154dd70031ef3121016791389a923122
treee767b587f15d8f3749fbb2d1023c912bcf3f033a
parent302104af4bd3793e5476221641bbcf6b1b8c9fb0
parentf9bb74c03791f1dcb9aa05aee28f97aef735c79f
Merge branch 'MDL-58058-master' of git://github.com/lameze/moodle