Merge branch 'MDL-62811' of git://github.com/timhunt/moodle
authorJun Pataleta <jun@moodle.com>
Wed, 18 Jul 2018 08:12:16 +0000 (16:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Jul 2018 00:46:51 +0000 (08:46 +0800)
commita766f5dc00fdc206b85b46bb5db6beaf13bf516e
treee5ed5bddb2a6570b0a67919a70918df781150484
parent432e755f2bafb0c9738610039130d578613df726
parentb116f8b9adab0dacc6008cfe2aff1afa6b294efd
Merge branch 'MDL-62811' of git://github.com/timhunt/moodle