Merge branch 'MDL-68567-master' of git://github.com/sarjona/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 25 May 2020 03:36:48 +0000 (11:36 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 25 May 2020 03:36:48 +0000 (11:36 +0800)
1  2 
lang/en/deprecated.txt

Simple merge