Merge remote-tracking branch 'upstream/develop' into feature/openldap-support

diff --cc config/config.exs
Simple merge

diff --cc docs/config.md
Simple merge

diff --cc lib/pleroma/web/auth/pleroma_authenticator.ex
Simple merge

diff --cc lib/pleroma/web/oauth/oauth_controller.ex
index 7d5a5b9c5c416c0fc7b5c576217698cb7604d39a,ec70b7ccc9379482510a4919cd5e2e30b55be1b8..d69383d400151df020f26711de0e714ec649db59
--- 1/lib/pleroma/web/oauth/oauth_controller.ex
--- 2/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@@ -5,12 -5,13 +5,12 @@@
  defmodule Pleroma.Web.OAuth.OAuthController do
    use Pleroma.Web, :controller
  
 -  alias Comeonin.Pbkdf2
+   alias Pleroma.Repo
+   alias Pleroma.User
    alias Pleroma.Web.Auth.Authenticator
+   alias Pleroma.Web.OAuth.App
    alias Pleroma.Web.OAuth.Authorization
    alias Pleroma.Web.OAuth.Token
-   alias Pleroma.Web.OAuth.App
-   alias Pleroma.Repo
-   alias Pleroma.User
  
    import Pleroma.Web.ControllerHelper, only: [oauth_scopes: 2]