From: Jake Dallimore <jake@moodle.com>
Date: Wed, 24 Jun 2020 01:39:19 +0000 (+0800)
Subject: Merge branch 'MDL-68992-master_france_digital_age' of https://github.com/martignoni... 
X-Git-Tag: v3.10.0-beta~475
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=061347a93a73ac45422bd1eed6a9d9ea87bff862

Merge branch 'MDL-68992-master_france_digital_age' of https://github.com/martignoni/moodle
---

061347a93a73ac45422bd1eed6a9d9ea87bff862