[#468] Merged upstream/develop, resolved conflicts.

2019-02-17 14:07:04 +03:00 · 2019-02-17 14:07:04 +03:00 · bc4f77b10b
commit bc4f77b10b
parent dcf24a3233 3b14119471
499 changed files with 1768 additions and 796 deletions
--- a/test/support/builders/user_builder.ex
+++ b/test/support/builders/user_builder.ex
@ -1,5 +1,6 @@
 defmodule Pleroma.Builders.UserBuilder do
-  alias Pleroma.{User, Repo}
+  alias Pleroma.User
+  alias Pleroma.Repo

  def build(data \\ %{}) do
    user = %User{