Merge branch 'MDL-62769' of https://github.com/timhunt/moodle
commit432e755f2bafb0c9738610039130d578613df726
authorJun Pataleta <jun@moodle.com>
Wed, 18 Jul 2018 07:10:56 +0000 (18 15:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:50 +0000 (19 08:46 +0800)
tree74ebdb015d46904aee4e860ab2247fc62618d577
parent76ca5c61d0e5bf18fe43194bcbde187bf6a0062d
parentdb421d4d529ff2bc7c8b625ca671cd74bbaca74e
Merge branch 'MDL-62769' of https://github.com/timhunt/moodle