Merge branch 'MDL-68984-master' of git://github.com/mickhawkins/moodle
commitb28f530a84aec935393ecc6e54dd8c6637920277
authorVíctor Déniz Falcón <victor@moodle.com>
Tue, 9 Jun 2020 12:45:40 +0000 (9 13:45 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Tue, 9 Jun 2020 12:45:40 +0000 (9 13:45 +0100)
tree8f7157b5734ddc7466562b3cdb2bd256beb68fad
parent6ea3c69c377cc7b111a3cb86ff2a64349ffcb4b8
parent8ddfc963b98a6f0bcd12ccf4172c447f7ff0de8f
Merge branch 'MDL-68984-master' of git://github.com/mickhawkins/moodle