Merge branch 'MDL-70143-master' of git://github.com/marinaglancy/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:52:03 +0000 (19:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:52:03 +0000 (19:52 +0100)
commit114102d37d88301988df4442eec1297d39b75d05
tree04a442e5b3f25efd7a536daf914b3757b2e047c8
parent1c3871e25a3104ca570b5f9d8d38e7092c9fcd35
parentc2aa5a29f1a6e0fed593056386599663ac48433d
Merge branch 'MDL-70143-master' of git://github.com/marinaglancy/moodle into master