Merge branch 'MDL-70387-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 13:56:04 +0000 (14:56 +0100)
committerSara Arjona <sara@moodle.com>
Wed, 13 Jan 2021 13:56:04 +0000 (14:56 +0100)
commit58eaf86573601e3d6145abca46cf083a6493a161
treef9f65223bc1b39a09dab5ca39c35781ba70bd502
parentf287ef5cb25e25ee616aa7e6f274d0522cf0e83b
parent7f02879ce7d7fa271e98800a0d3586a56fa2b1ea
Merge branch 'MDL-70387-master' of git://github.com/jleyva/moodle