Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
authorlink0ff <juri@linkov.net>
Sun, 3 Mar 2019 16:29:37 +0000 (18:29 +0200)
committerlink0ff <juri@linkov.net>
Sun, 3 Mar 2019 16:29:37 +0000 (18:29 +0200)
commit19e2b852473ea4d371fb3d77e9344025e0499428
treedcd43e823f7687767651e6eb0877b5b4aca53882
parente278d470232f4e8081bbbe358137400074673e75
parentace4231628ad1af08c8696fb7fe6983549f62631
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
config/config.exs
docs/config.md
lib/pleroma/web/oauth/oauth_controller.ex