Merge branch 'MDL-60707' of git://github.com/aolley/moodle
commite105a752c0543bcc29ea0938a827418a7add96db
authorJake Dallimore <jake@moodle.com>
Mon, 13 Nov 2017 05:26:00 +0000 (13 13:26 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 13 Nov 2017 05:26:00 +0000 (13 13:26 +0800)
tree11ac9ac068eeea539133886cd69559d7ecc3514c
parentdbc56205b356302788080ad874b9f42b5f773c98
parent7f83e99e5fa0e0ce82a41e7658b3c6a42b48081f
Merge branch 'MDL-60707' of git://github.com/aolley/moodle