Merge branch 'MDL-68905-master' of git://github.com/sarjona/moodle
commit069ae9134fae739ac6a2067eedd970526d5b99ed
authorVíctor Déniz Falcón <victor@moodle.com>
Thu, 4 Jun 2020 15:22:10 +0000 (4 16:22 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Thu, 4 Jun 2020 15:22:10 +0000 (4 16:22 +0100)
tree73d4e380dbe486f77bed96f5fa4c2f7ea934c6ab
parentce8201c876b759c99e22600a1b7851b6d72818c4
parentcbe0bb91fd4367d22d20c249b3791045f822c8bd
Merge branch 'MDL-68905-master' of git://github.com/sarjona/moodle