Merge branch 'MDL-69265-email-headers' of https://github.com/brendanheywood/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:28:27 +0000 (07:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 12 Aug 2020 23:28:27 +0000 (07:28 +0800)
1  2 
lang/en/admin.php

Simple merge