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)
commit89da3f67e4db06657198c9c0cf928771e99efb2b
tree340879684f17552eb83c5b79f7791ba4bcfe3c65
parent2b180d54ef534b755fc72c8c985042dbeec1a14d
parente45c86375aa741c2968d53f20491e33b15698284
Merge branch 'MDL-64071-master' of https://github.com/UniGe/moodle
auth/ldap/auth.php
auth/ldap/lang/en/auth_ldap.php