[#468] Merged upstream/develop, resolved conflicts.
This commit is contained in:
commit
bc4f77b10b
499 changed files with 1768 additions and 796 deletions
|
|
@ -4,7 +4,9 @@
|
|||
|
||||
defmodule Pleroma.Web.OAuth.TokenTest do
|
||||
use Pleroma.DataCase
|
||||
alias Pleroma.Web.OAuth.{App, Token, Authorization}
|
||||
alias Pleroma.Web.OAuth.App
|
||||
alias Pleroma.Web.OAuth.Authorization
|
||||
alias Pleroma.Web.OAuth.Token
|
||||
alias Pleroma.Repo
|
||||
|
||||
import Pleroma.Factory
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue