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)
commit2f27dca60d64e630ee13f2c66f1fa9b8b94054e3
tree9fe3d7c6085dece4fa21f78d446e7cc2f906bc3e
parentbd0391d284498c03e5cc37b2aacf4f585000b4e7
parentd2bba97d7760e16e5d22243cdc0aa3afbd643e7c
Merge branch 'MDL-60548-master-v4' of https://github.com/Dave-B/moodle
lang/en/moodle.php
user/lib.php