Merge branch 'MDL-69087-master' of git://github.com/sarjona/moodle
commit5cdc620f67df4068a2bb5bd7d6628f388c5575e8
authorVíctor Déniz <victor@moodle.com>
Thu, 1 Oct 2020 22:43:01 +0000 (1 23:43 +0100)
committerVíctor Déniz <victor@moodle.com>
Thu, 1 Oct 2020 22:43:01 +0000 (1 23:43 +0100)
treeff09c357096504a590aa2079e4bfa65f46a5e25d
parentb39c286ea4b719e4af8f4645db7ce1e8f9f1cc66
parentc68897b7e6793b4cf8ca129a9642f17b1d9bbe38
Merge branch 'MDL-69087-master' of git://github.com/sarjona/moodle