Merge branch 'feature/openldap-support' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 15 Mar 2019 19:57:09 +0000 (19:57 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 15 Mar 2019 19:57:09 +0000 (19:57 +0000)
OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859

1  2 
config/config.exs
docs/config.md

Simple merge
diff --cc docs/config.md
Simple merge