aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2019-02-17 17:39:45 +0000
committerlambda <pleromagit@rogerbraun.net>2019-02-17 17:39:45 +0000
commita2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782 (patch)
tree6020b41080baf529496a5faf36e1523279a76511 /lib/pleroma/web/oauth/oauth_controller.ex
parent25ab90edeaae53b6ce084d1ba9a02df5505b5041 (diff)
parent79e503b3f5ea87c53d4c616ca9ddfa049877705c (diff)
downloadpleroma-a2f4fc49fe6d12fb9fc442b63f2ddd63e3e44782.tar.gz
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
# Conflicts: # mix.exs
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index e4d0601f8..dddfcf299 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -173,7 +173,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
token
|> URI.decode()
|> Base.url_decode64!(padding: false)
- |> Base.url_encode64()
+ |> Base.url_encode64(padding: false)
end
defp get_app_from_request(conn, params) do