Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
authorlink0ff <juri@linkov.net>
Thu, 14 Mar 2019 15:43:30 +0000 (17:43 +0200)
committerlink0ff <juri@linkov.net>
Thu, 14 Mar 2019 15:43:30 +0000 (17:43 +0200)
commit54e7087ab412a488f8ad7286aef89d313e5e7b14
tree9391107eb5aec3940bf6150539acc38e85224751
parent9338f061a303ae3d57a8ea1af524c2ca51929f8d
parent59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
config/config.exs
docs/config.md
lib/pleroma/web/auth/pleroma_authenticator.ex
lib/pleroma/web/oauth/oauth_controller.ex