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)
commit8b352af4dd4f79432e3e9c48593380292e4002d7
tree095ae99a4174942d170b14578a9e079077befb1d
parentacf215d983f7a57fb8375184e24d2e04eda74eb5
parenta070dd4a83788dfd76809d8b4ee4111b05cdff47
Merge branch 'feature/openldap-support' into 'develop'

OpenLDAP support

Closes #203

See merge request pleroma/pleroma!859
config/config.exs
docs/config.md