Merge branch 'MDL-61954-master' of git://github.com/sarjona/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:39:24 +0000 (10:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 16 Apr 2018 02:39:24 +0000 (10:39 +0800)
commit77fc10710fd7275daaf2eccd4ce5adfd789103dc
tree7a91a4c1114a8344e074b802c6b2b6498872eb6e
parent34e98391e64edb0ec264ae68393236d42acd9946
parent3d702cc227bf0b304aec062763e7ed97b155d7e1
Merge branch 'MDL-61954-master' of git://github.com/sarjona/moodle