diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-02 15:41:30 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-02 15:41:30 +0700 |
| commit | a1869f5272ddd83cdf2b2fc487668de79f2d0c6d (patch) | |
| tree | def42bef14e8ced310471a194080e38cbee15452 /test/web/ostatus/ostatus_controller_test.exs | |
| parent | 16e598ec11cb9178b9fc53a1ec4b649d97c5f3b8 (diff) | |
| parent | f8aa917eef9280631a5cd2c95cf1db8fab6e14e5 (diff) | |
| download | pleroma-a1869f5272ddd83cdf2b2fc487668de79f2d0c6d.tar.gz pleroma-a1869f5272ddd83cdf2b2fc487668de79f2d0c6d.zip | |
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
Diffstat (limited to 'test/web/ostatus/ostatus_controller_test.exs')
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs index da9c72be8..2950f11c0 100644 --- a/test/web/ostatus/ostatus_controller_test.exs +++ b/test/web/ostatus/ostatus_controller_test.exs @@ -5,9 +5,9 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do use Pleroma.Web.ConnCase import Pleroma.Factory - alias Pleroma.User - alias Pleroma.Repo alias Pleroma.Object + alias Pleroma.Repo + alias Pleroma.User alias Pleroma.Web.CommonAPI alias Pleroma.Web.OStatus.ActivityRepresenter |