Merge branch 'MDL-68745-master-fix' of github.com:sarjona/moodle
authorSara Arjona <sara@moodle.com>
Fri, 5 Jun 2020 20:17:59 +0000 (22:17 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 5 Jun 2020 20:17:59 +0000 (22:17 +0200)
commit4abb69f5889d77f98d0c1691c813bb748618338f
tree1891b084df507247bc8a7c9e1188b1a9792642d2
parent6ddab9d6d365e1ade37b07df07cc4a83fcd73d28
parent515bc8f4e05bc413974c2a1c9f81a28f47d65538
Merge branch 'MDL-68745-master-fix' of github.com:sarjona/moodle