Merge branch 'MDL-61133-master-fixes' of https://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Feb 2018 04:01:55 +0000 (12:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 8 Feb 2018 04:01:55 +0000 (12:01 +0800)
commit49b12fdbd1caec5b518dce64d47b0cd5ffbcb6ef
treedaedeb1f5f8ab6f32f6448a875b7e9236c841229
parent42afb6c2ac7b70cc8c9a4e1ab5001f2ff64549d7
parente842596d1d56dcf5fb9c47f3473953e32bf1a309
Merge branch 'MDL-61133-master-fixes' of https://github.com/lameze/moodle