Merge branch 'MDL-67687-master-2' of git://github.com/andrewnicols/moodle into master
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2020 22:59:15 +0000 (00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 5 Aug 2020 22:59:15 +0000 (00:59 +0200)
commitd55f2b787cada9edd94ae0b374163c4c770ccf73
treeb85e9e01dd30944372b3fee05ee5ef3b265ceebc
parent4500d4bb3cc7657d4738599aa107ca349f45be32
parent39a736ef9abee5bb7cd49114882bf87b4e741fa6
Merge branch 'MDL-67687-master-2' of git://github.com/andrewnicols/moodle into master