projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
authorization.ex
diff --git
a/lib/pleroma/web/oauth/authorization.ex
b/lib/pleroma/web/oauth/authorization.ex
index d37c2cb83b5c70fe67866e97290627f0352b6156..a80543adf3a83729ffa14851325d208f253f375c 100644
(file)
--- a/
lib/pleroma/web/oauth/authorization.ex
+++ b/
lib/pleroma/web/oauth/authorization.ex
@@
-5,10
+5,10
@@
defmodule Pleroma.Web.OAuth.Authorization do
use Ecto.Schema
defmodule Pleroma.Web.OAuth.Authorization do
use Ecto.Schema
- alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.Repo
- alias Pleroma.
Web.OAuth.Authorization
+ alias Pleroma.
User
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.App
+ alias Pleroma.Web.OAuth.Authorization
import Ecto.Changeset
import Ecto.Query
import Ecto.Changeset
import Ecto.Query