Merge branch 'MDL-30634-master' of git://github.com/Dave-B/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 08:08:19 +0000 (09:08 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 1 Aug 2017 08:08:33 +0000 (09:08 +0100)
commit2c34c10799ad4b1c72f2dd140cc3ad2ffe29415e
tree24874286eed2d9017a2ce07ee64ad227374fa725
parent71b917ace60df8f5845dfc42cce1e4e6d529c858
parent8fb9a27170710cf8f4c52d2235b2aff0f5dd63f1
Merge branch 'MDL-30634-master' of git://github.com/Dave-B/moodle
auth/ldap/db/upgrade.php
auth/ldap/version.php