Merge branch 'MDL-68992-master_france_digital_age' of https://github.com/martignoni...
authorJake Dallimore <jake@moodle.com>
Wed, 24 Jun 2020 01:39:19 +0000 (09:39 +0800)
committerJake Dallimore <jake@moodle.com>
Wed, 24 Jun 2020 02:11:08 +0000 (10:11 +0800)

Trivial merge