Merge branch 'MDL-68112-master' of git://github.com/peterRd/moodle
commit767fa3a64b090372af70e042f05a01b940d706a7
authorSara Arjona <sara@moodle.com>
Fri, 10 Apr 2020 10:11:29 +0000 (10 12:11 +0200)
committerSara Arjona <sara@moodle.com>
Fri, 10 Apr 2020 10:11:29 +0000 (10 12:11 +0200)
tree8beeda0f8afe37464a2752ad09f245828df3e34e
parentf167f9379983d93be8d324213a12701837419956
parentb15b259696115369c16ca9ee347c5891090f61fe
Merge branch 'MDL-68112-master' of git://github.com/peterRd/moodle