Merge branch 'MDL-68167-master' of git://github.com/rezaies/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 30 Oct 2020 05:17:02 +0000 (13:17 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 30 Oct 2020 05:17:02 +0000 (13:17 +0800)
1  2 
lang/en/user.php

Simple merge