Merge branch 'MDL-59832_master-v2' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 23:21:22 +0000 (01:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 23:21:22 +0000 (01:21 +0200)
1  2 
user/index.php

diff --cc user/index.php
Simple merge