Merge branch 'MDL-69228-master' of git://github.com/andrewnicols/moodle
authorSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 10:41:05 +0000 (12:41 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 14 Jul 2020 10:41:05 +0000 (12:41 +0200)
commitebd307b39692f4d964a3d0b8f4cbe8fc9b8fd716
tree3f18bad28ea78080e21e8312d33a8b28291c2eb9
parent168348abebfb2680efa198cebf3e94ccff8e746b
parent0bf024e48a2ac1be443ee8b9108aaaea0eaf7d53
Merge branch 'MDL-69228-master' of git://github.com/andrewnicols/moodle