Merge branch 'MDL-69513-dkim-settings' of https://github.com/brendanheywood/moodle
authorVíctor Déniz <victor@moodle.com>
Wed, 21 Oct 2020 10:13:17 +0000 (11:13 +0100)
committerVíctor Déniz <victor@moodle.com>
Wed, 21 Oct 2020 10:57:11 +0000 (11:57 +0100)
commit3e6892af4b7f7a17180a340b897e167d97f5b976
tree02fe6811ea4dcd2b0cad06054b465beb0fd9ebe0
parent6ca0291f5af42d45eca9c350695cba6571b8fd0d
parent1b47d4bc0e7eb9dd2d24e232008cc2771b7b11a1
Merge branch 'MDL-69513-dkim-settings' of https://github.com/brendanheywood/moodle
admin/settings/server.php
lang/en/admin.php
lib/moodlelib.php
lib/upgrade.txt