Merge branch 'MDL-69017-master' of git://github.com/andrewnicols/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 11 Jun 2020 08:59:04 +0000 (16:59 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 11 Jun 2020 08:59:04 +0000 (16:59 +0800)
1  2 
user/index.php

diff --cc user/index.php
Simple merge