Merge branch 'MDL-68583-master-fix' of github.com:sarjona/moodle
commit471cc93a457c9fd344de90cf20e82f5943a7261b
authorSara Arjona <sara@moodle.com>
Thu, 28 May 2020 15:58:51 +0000 (28 17:58 +0200)
committerSara Arjona <sara@moodle.com>
Thu, 28 May 2020 15:58:51 +0000 (28 17:58 +0200)
tree097ef2423a4d94dacfdce15cb8e23776b3743cf8
parentf27e579cdd7695d3bf86193ec1e250a119e8128c
parent582481c3e9b98d683b72a59c09f3165c51786768
Merge branch 'MDL-68583-master-fix' of github.com:sarjona/moodle