Merge branch 'MDL-69513-dkim-settings-MOODLE_310_STABLE' of https://github.com/brenda...
authorVíctor Déniz <victor@moodle.com>
Wed, 21 Oct 2020 10:32:33 +0000 (11:32 +0100)
committerVíctor Déniz <victor@moodle.com>
Wed, 21 Oct 2020 10:56:54 +0000 (11:56 +0100)
commit2dd9b53fd60ef61f61c4f0a70c9492a569de4622
treef3d89bef37e9c80c00919f1f7baaca7d04b7ff62
parent8996ed98c722348340911f4c80591925d9826faa
parent4db3403481e3fc99af7a4437357b7243278355d4
Merge branch 'MDL-69513-dkim-settings-MOODLE_310_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_310_STABLE
admin/settings/server.php
lang/en/admin.php
lib/moodlelib.php
lib/upgrade.txt