Merge branch 'MDL-69510-310' of https://github.com/snake/moodle into MOODLE_310_STABLE
commit5ba67416e65df7253f565b2852953aad1c87fc76
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Sep 2020 13:28:33 +0000 (8 15:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Sep 2020 13:28:33 +0000 (8 15:28 +0200)
treef3f4544397ca9ef3fed0911ee84d5126346ad773
parentbd0de2d9653a508217b16f38c465a5f9a6f0e8f8
parentb96e85feacad1147cef5b80cfc6b2da94ba4775b
Merge branch 'MDL-69510-310' of https://github.com/snake/moodle into MOODLE_310_STABLE
auth/cas/settings.php
auth/ldap/lang/en/auth_ldap.php
auth/ldap/settings.php