Merge branch 'MDL-64071-master' of https://github.com/UniGe/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 16:56:59 +0000 (17:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Feb 2019 16:56:59 +0000 (17:56 +0100)
1  2 
auth/ldap/auth.php
auth/ldap/lang/en/auth_ldap.php

Simple merge
Simple merge