Merge branch 'MDL-62781-master' of git://github.com/junpataleta/moodle
commit76ca5c61d0e5bf18fe43194bcbde187bf6a0062d
authorJun Pataleta <jun@moodle.com>
Wed, 18 Jul 2018 02:07:45 +0000 (18 10:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:49 +0000 (19 08:46 +0800)
tree3c603484b9a7dcba95279afe8acf3516cc22535d
parent3ffb8d231749af54d1cad67ba712baa01e70f0b3
parent061e9f4b11d44c888a3e498b41a9f1f8520b1ec2
Merge branch 'MDL-62781-master' of git://github.com/junpataleta/moodle