From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Thu, 8 Oct 2020 14:58:34 +0000 (+0200)
Subject: Merge branch 'MDL-69810-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
X-Git-Tag: v3.10.0-beta~85
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ca80e9a68dae2e207c07a6dce2243cfb90c3002d

Merge branch 'MDL-69810-310' of git://github.com/jleyva/moodle into MOODLE_310_STABLE
---

ca80e9a68dae2e207c07a6dce2243cfb90c3002d