From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 18 Aug 2020 22:19:43 +0000 (+0200)
Subject: Merge branch 'MDL-69095-master' of git://github.com/jleyva/moodle into master
X-Git-Tag: v4.0.0-beta~2373
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=d66512d213a2f4850f2589417ca9935d0ecb2f37;hp=-c

Merge branch 'MDL-69095-master' of git://github.com/jleyva/moodle into master
---

d66512d213a2f4850f2589417ca9935d0ecb2f37