Merge branch 'MDL-59671-master-fix' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Aug 2017 07:09:08 +0000 (15:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Aug 2017 07:09:08 +0000 (15:09 +0800)
commitffd1747b110a91cdcdddc958225505ed6b88d5e5
tree91de35be4e61c09bdeaf2eee3da1c3840a05e9c5
parentba07a8e7dacd0a8f39d15ffd9f93621be3b452dd
parent436d39ba85e5375c8908dc28e097c4d28e1dc9d8
Merge branch 'MDL-59671-master-fix' of git://github.com/lameze/moodle