Merge branch 'MDL-68894-master' of git://github.com/andrewnicols/moodle
authorAdrian Greeve <abgreeve@gmail.com>
Thu, 4 Jun 2020 00:43:53 +0000 (08:43 +0800)
committerAdrian Greeve <abgreeve@gmail.com>
Thu, 4 Jun 2020 00:43:53 +0000 (08:43 +0800)
1  2 
user/index.php

diff --cc user/index.php
Simple merge