Merge branch 'MDL-68464-master-final' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 May 2020 22:17:53 +0000 (00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 May 2020 22:17:53 +0000 (00:17 +0200)
1  2 
user/index.php

diff --cc user/index.php
Simple merge