Merge branch 'MDL-63679-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:12:50 +0000 (15:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 25 Oct 2018 07:12:50 +0000 (15:12 +0800)
commitfbf4eaeec0c6924e37207a50489fdefb4331572c
tree36aefcc637027869635afc329e62afc6d9ae600a
parentc31ac0f5e239523f605d868e19f5ff52a8b26fd1
parentcc2b9d66838336434e8a71de6bd7a57cfa7f68bf
Merge branch 'MDL-63679-master' of git://github.com/mihailges/moodle