Merge remote-tracking branch 'upstream/master'

Browse Source

I am currently working on a kopano docker integration and needed ldap
support, for authentication and also for user validation.

I also updated the README.

...

This commit is contained in:

alinmear 2016-09-29 11:49:27 +02:00

parent 6fecbc6d26 c2eb975ace

commit 2848416f24

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available