Merge branch 'MDL-68697-master' of git://github.com/andrewnicols/moodle
commitca7127ed03479b52753ff242788ecc977308b66e
authorVíctor Déniz Falcón <victor@moodle.com>
Wed, 13 May 2020 15:53:16 +0000 (13 16:53 +0100)
committerVíctor Déniz Falcón <victor@moodle.com>
Wed, 13 May 2020 15:53:16 +0000 (13 16:53 +0100)
treed2b3462fefebf147c43390ef1eb9428a542ffb6c
parent9c09ec41d61eec61f076f6444d95159452675c9d
parent0e809762d404a37428610cf6a0493a3fd4dc092d
Merge branch 'MDL-68697-master' of git://github.com/andrewnicols/moodle