Merge branch 'MDL-26401-39' of git://github.com/lameze/moodle into MOODLE_39_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 00:52:02 +0000 (08:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 19 Aug 2020 00:52:02 +0000 (08:52 +0800)
1  2 
lang/en/error.php

Simple merge