Merge branch 'MDL-60548-master-v4' of https://github.com/Dave-B/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 15:14:46 +0000 (17:14 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2018 15:14:46 +0000 (17:14 +0200)
1  2 
lang/en/moodle.php
user/lib.php

Simple merge
diff --cc user/lib.php
Simple merge