Merge branch 'MDL-62746-master' of git://github.com/junpataleta/moodle
commit39650bc12ffc5f069c417995b06a7c7313ff5396
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 01:33:05 +0000 (10 09:33 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 10 Jul 2018 01:33:05 +0000 (10 09:33 +0800)
treec931b26ff37ac807e6bf970d66cd55aeda934e3a
parent793fe5fc4cc5dafb41bb47cdaf367cd2461f97d5
parent65cac8008802f8e5d0e7a127c85a167a86c0a282
Merge branch 'MDL-62746-master' of git://github.com/junpataleta/moodle