Jan-Willem van der Meer c1865b69cd Fix merge conflicts ...

Due to the complicated merge, part of the new functionalilty is inserted here

2014-10-14 23:41:07 +02:00

..

access.rb

Fix merge conflicts

2014-10-14 23:41:07 +02:00

adapter.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

authentication.rb

Add explaining note to authentication method [skip ci]

2014-10-14 11:16:47 +02:00

config.rb

Use Hash syntax for LDAP server declaration

2014-10-14 13:13:59 +02:00

group.rb

Remove unecessary nesting.

2014-10-14 08:24:48 +02:00

person.rb

Fix merge conflicts

2014-10-14 23:41:07 +02:00

user.rb

Fix authorization for LDAP login

2014-10-14 09:40:35 +02:00