Merge branch 'MDL-67386-master-fix' of github.com:sarjona/moodle
commita706f7161fea0081dfe5a331ea21605bf488140c
authorSara Arjona <sara@moodle.com>
Mon, 25 May 2020 15:58:39 +0000 (25 17:58 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 25 May 2020 15:58:39 +0000 (25 17:58 +0200)
treeaf8ca543a415c0ca16cc8d6c26753f414672040f
parent028d43b37d8a8e6432d3e9f1de6786952e57b4f8
parent36e2a9af84b1a9dbe7b32967531591412e7002b0
Merge branch 'MDL-67386-master-fix' of github.com:sarjona/moodle