Merge branch 'MDL-59988_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Oct 2017 00:19:06 +0000 (08:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Oct 2017 00:19:06 +0000 (08:19 +0800)
commitdd178011b42704fb7a8992273ecb37c49772b851
tree661028af97968c9c7662b6e278c18efd2690cffd
parent9a316f33672117dd6c9d575fd59351175f328289
parent2dca1339163b14fdfbae6fa000f45c11d4b64a9e
Merge branch 'MDL-59988_master' of git://github.com/dmonllao/moodle