Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 09:05:39 +0000 (10:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 09:05:39 +0000 (10:05 +0100)
commit7110a3eed6954a401a927b3e0fa80d74f2889db1
tree61471002039111cdf53ca5ee4466d711affb4d37
parentb3f7f6d0965aa53a06c612886b53fa262f693599
parent700522badd64ca538f8927089d1858eb2a3b61c8
Merge branch 'MDL-61046-master-enfix' of git://github.com/mudrd8mz/moodle
lang/en/auth.php