Merge branch 'MDL-69214' of https://github.com/paulholden/moodle
commita86f428702291b393905be94cb7299961020896f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Jul 2020 22:00:48 +0000 (16 00:00 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 16 Jul 2020 14:21:27 +0000 (16 16:21 +0200)
treeb0fb6bec00fcdf727906d705a2d5a6001e35a020
parent5a32562f82b88e45dc02bb7b6b15a9babbe84fac
parentca02422d66c5881e07a84df7c1c36b14d11a9c8f
Merge branch 'MDL-69214' of https://github.com/paulholden/moodle