From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Fri, 6 Nov 2020 18:27:10 +0000 (+0100)
Subject: Merge branch 'MDL-70139-master' of git://github.com/sarjona/moodle into master
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=1c3871e25a3104ca570b5f9d8d38e7092c9fcd35

Merge branch 'MDL-70139-master' of git://github.com/sarjona/moodle into master
---

1c3871e25a3104ca570b5f9d8d38e7092c9fcd35