Merge branch 'MDL-69632-master-adminserversettings' of git://github.com/mudrd8mz...
authorSara Arjona <sara@moodle.com>
Mon, 7 Sep 2020 11:43:52 +0000 (13:43 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 7 Sep 2020 11:43:52 +0000 (13:43 +0200)

Trivial merge