Merge branch 'MDL-60207-master' of git://github.com/ryanwyllie/moodle
commit0e75d337ee6d1a3210585ae362dfe705f3b02d6e
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jun 2018 01:41:45 +0000 (13 09:41 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 13 Jun 2018 01:41:45 +0000 (13 09:41 +0800)
treeca3303a3b17480cd63254576ebf0922b74ac5c4e
parentc3f13f534d0aca28d93a42309f7a4f5613fabfcc
parent7e0305be705500866159530b94052dbb18056ca4
Merge branch 'MDL-60207-master' of git://github.com/ryanwyllie/moodle