Merge branch 'MDL-59831_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 06:07:52 +0000 (08:07 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 12 Sep 2017 06:07:52 +0000 (08:07 +0200)
1  2 
user/index.php

diff --cc user/index.php
Simple merge