Merge branch 'MDL-6074-master' of git://github.com/mihailges/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jun 2018 01:38:55 +0000 (09:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jun 2018 01:38:55 +0000 (09:38 +0800)
commitc3f13f534d0aca28d93a42309f7a4f5613fabfcc
treea49ecf12d866d0adcf985b1cd53594ce759b5f0d
parenta9f6dd075a1e696428886882a611841f03320462
parent5226999dd70daf58b6871d202072bc5cc1a17ecc
Merge branch 'MDL-6074-master' of git://github.com/mihailges/moodle