Merge branch 'MDL-66906-master-fix' of git://github.com/andrewnicols/moodle
commitbbb7cb21730aa49cd7a5b237171b61bd2bfef696
authorJun Pataleta <jun@moodle.com>
Tue, 12 Nov 2019 14:01:37 +0000 (12 22:01 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 12 Nov 2019 14:01:37 +0000 (12 22:01 +0800)
tree7f8655f9e12caa9c007e6b52cd7f0736286e4851
parent134f11e15ad277e61339c3ef5a865ebe3c6ad4ed
parent49d5920ac6720a4a31ce10f6ab154703ac3e5517
Merge branch 'MDL-66906-master-fix' of git://github.com/andrewnicols/moodle