hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'pleroma/develop' into alias-router-helpers

Browse source
This commit is contained in:
Alex Gleason 2021-05-19 12:49:00 -05:00
commit ad7d4ff8bc
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
174 changed files with 5125 additions and 1278 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/o_auth/o_auth_view.ex
View file

@ -10,6 +10,7 @@ defmodule Pleroma.Web.OAuth.OAuthView do
def render("token.json", %{token: token} = opts) do
response = %{
id: token.id,
token_type: "Bearer",
access_token: token.token,
refresh_token: token.refresh_token,