Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 08:47:19 +0000 (16:47 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 11 Dec 2017 08:47:19 +0000 (16:47 +0800)
commit42cec8067385bc3064d903e9a7b008472ec262fd
tree0641f13640234ad75ef4fa9884b2211d6f8c818d
parent10cc00b4af299e2858d08ac16734a8ade38ec621
parent83b9a7c88c6b46092f86fe4f96dde80e91fb304d
Merge branch 'MDL-56197-master' of git://github.com/mihailges/moodle