Merge branch 'MDL-63726-master' of https://github.com/lucaboesch/moodle
commit07a64c681a7fcf5f293cce10d839dd598ef60c02
authorDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 09:17:29 +0000 (31 10:17 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 31 Oct 2018 09:17:29 +0000 (31 10:17 +0100)
treec0ca350975c722af1331d1480aba3c8e6005772f
parent52d575b396abde79f935bc19203bac2c5cb53a98
parentabc469dd3b601c98125164e83e2142391983146f
Merge branch 'MDL-63726-master' of https://github.com/lucaboesch/moodle