Merge branch 'MDL-61411-master' of git://github.com/Kathrin84/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:21:23 +0000 (11:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:21:23 +0000 (11:21 +0800)
commitc9591cdde6c4185026f74aa0f034c578306338e7
tree124104995d4da9b45b2a17ab6af5846585be021f
parent06cab841769727f5622602211771dd62da995aa0
parent07b203db88614f36404e784943a44c5e678ef2ec
Merge branch 'MDL-61411-master' of git://github.com/Kathrin84/moodle