Merge branch 'MDL-61408-master' of https://github.com/lucaboesch/moodle
commit6478b4e4638131df3bdea40d6322202816c5716b
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Feb 2018 03:09:30 +0000 (19 11:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 22 Feb 2018 00:30:49 +0000 (22 08:30 +0800)
tree6ebd087713e78e1b23630e7e1a644d54e97a376a
parent25e0557484f7bb92167e1c2f0a1fc3b951d5ed8e
parenta58fd9710d1e82adeff8f96bd8d3b91e859575d4
Merge branch 'MDL-61408-master' of https://github.com/lucaboesch/moodle