Merge branch 'MDL-61154_master' of git://github.com/dmonllao/moodle
commitdb98868d2233c99a6711b68cfa15bdbbe707ecec
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:09:29 +0000 (19 10:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 19 Mar 2018 02:09:29 +0000 (19 10:09 +0800)
treeb730912b2ff51c564f53101bff526d3b6e371c23
parentd7a6e531eee436da32d5de9b194eb3b36c2097fd
parent63f2c0c664bba047ef67eb32a26e103c1236243f
Merge branch 'MDL-61154_master' of git://github.com/dmonllao/moodle