Merge branch 'MDL-67681_master' of https://github.com/marxjohnson/moodle
authorSara Arjona <sara@moodle.com>
Tue, 4 Feb 2020 11:16:39 +0000 (12:16 +0100)
committerSara Arjona <sara@moodle.com>
Tue, 4 Feb 2020 11:16:39 +0000 (12:16 +0100)
commitceaa04ffea8f066e781ba7e025453e73026515ee
tree4d3da6e95bcceb53933cddd91cdd265217661a32
parent7be4a3fba1c4eb473c00eb48d691b8d9295f84ef
parentd62ce1d4198987e3c33e52c8aefb24100151b23b
Merge branch 'MDL-67681_master' of https://github.com/marxjohnson/moodle