Merge branch 'MDL-62283-master' of https://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 02:36:37 +0000 (10:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jun 2018 02:36:37 +0000 (10:36 +0800)
commit68a482e1678a94192a816dc128ec88b14485fa03
tree1e174d731f88a19a8c24150c00d0fe3381b4c80d
parent2ffb5ea5e99043815194be9a22ee7b188f95e80c
parentc449fbcf7223edb2b478975dbe9230111c55a215
Merge branch 'MDL-62283-master' of https://github.com/Kathrin84/moodle