Merge branch 'MDL-61952-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:50:50 +0000 (10:50 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:50:50 +0000 (10:50 +0800)
commit3224e06de4a239ae88b60d9343983c0606a0bc0c
tree2dc68c3a7ffccdf2c72d3550a84f580c12ff06ae
parent77fc10710fd7275daaf2eccd4ce5adfd789103dc
parent8517245516f4600328d2ffdfe47c4f6e6c2b6970
Merge branch 'MDL-61952-master' of git://github.com/sarjona/moodle