Merge branch 'MDL-68737_master' of https://github.com/t-schroeder/moodle
commite948a6354e9a57c748e999cf430d8ba7c050a947
authorJun Pataleta <jun@moodle.com>
Tue, 21 Jul 2020 13:55:41 +0000 (21 21:55 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 21 Jul 2020 13:55:41 +0000 (21 21:55 +0800)
tree090f363a40cc741ec1bd502f713e6cfaf55c6228
parent17e99314a29463ae03e2a34b04e955a52a6765f8
parent396a282a2dd84810a5e8070c930a051ec28d0aed
Merge branch 'MDL-68737_master' of https://github.com/t-schroeder/moodle