Merge branch 'MDL-70130-master' of git://github.com/andrewnicols/moodle
commit48e4dbea7cb29dd341c0a168c46fa2e3c14d7d4c
authorJun Pataleta <jun@moodle.com>
Fri, 6 Nov 2020 03:28:02 +0000 (6 11:28 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 6 Nov 2020 03:28:02 +0000 (6 11:28 +0800)
treef0bafb65b076ca13186df667644e572c4c451252
parent8a9a4ee4f3588bf20fab49bfa2cb9a93b823fa5a
parentc42c08793b5ecc94fb23d78cec95f2602e02caf0
Merge branch 'MDL-70130-master' of git://github.com/andrewnicols/moodle