1318ac204e
Conflicts: app/models/auth_source_ldap.rb config/locales/en.yml test/unit/auth_source_ldap_test.rb
Conflicts: app/models/auth_source_ldap.rb config/locales/en.yml test/unit/auth_source_ldap_test.rb