Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle
commitbbb9e171332eb3e335c433e022fb6070753b9866
authorJake Dallimore <jake@moodle.com>
Tue, 24 Oct 2017 05:59:33 +0000 (24 13:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 25 Oct 2017 04:45:52 +0000 (25 12:45 +0800)
tree067a1d05ae2b577a3470fe45485258761ae9f2b0
parent6ee00de11b403b0a28c5531f5a86f814d0026632
parent6428642adb3d668494ef22ad3a184fad889609f4
Merge branch 'MDL-60429-master' of git://github.com/lameze/moodle