Merge branch 'develop' into feature/database-compaction

2019-04-17 12:22:32 +03:00 · 2019-04-17 12:22:32 +03:00 · 627e5a0a49
commit 627e5a0a49
parent d6ab701a14 73df3046e0
1271 changed files with 42114 additions and 70683 deletions
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@ -1,5 +1,5 @@
 defmodule Pleroma.Object.Fetcher do
-  alias Pleroma.{Object, Repo}
+  alias Pleroma.Object
  alias Pleroma.Object.Containment
  alias Pleroma.Web.ActivityPub.Transmogrifier
  alias Pleroma.Web.OStatus