aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/common_api/common_api.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-05-13 10:56:11 +0200
committerlain <lain@soykaf.club>2018-05-13 10:56:11 +0200
commit76722ea9c8dfbb8fefe247883946aa5c872d9a49 (patch)
tree34020541df1d6684e935cfd09f36cb6eed7b13f6 /lib/pleroma/web/common_api/common_api.ex
parenta3d1d4894fdd8dd0133e1d2c6fde9d95f49dfcc7 (diff)
parentbb864e96ad4e0be470da78baa000019f571e30db (diff)
downloadpleroma-76722ea9c8dfbb8fefe247883946aa5c872d9a49.tar.gz
Merge branch 'develop' into kaniini/pleroma-bugfix/unlisted-statuses
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r--lib/pleroma/web/common_api/common_api.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index 2c4b591d4..14a68929d 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -1,5 +1,5 @@
defmodule Pleroma.Web.CommonAPI do
- alias Pleroma.{Repo, Activity, Object, User}
+ alias Pleroma.{Repo, Activity, Object}
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Formatter