Merge branch 'master' into install_master
commit2b7c85cc4e06283bda557cce44f896123b0c103f
authorAMOS bot <amos@moodle.org>
Sat, 12 Dec 2020 00:07:58 +0000 (12 00:07 +0000)
committerAMOS bot <amos@moodle.org>
Sat, 12 Dec 2020 00:07:58 +0000 (12 00:07 +0000)
tree8078ca5bb5132ccea1be1c6b771b83d3f64289b0
parent5587d300836641cf3c39115abb80321c3acc5d19
parentc307f3b1384a03081ef6e16f42e9bdc1b8964ba4
Merge branch 'master' into install_master