1318ac204e
Conflicts: app/models/auth_source_ldap.rb config/locales/en.yml test/unit/auth_source_ldap_test.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
additional_environment.rb.example | ||
boot.rb | ||
configuration.yml.example | ||
database.yml.example | ||
environment.rb | ||
preinitializer.rb | ||
routes.rb | ||
settings.yml |