diff options
author | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
---|---|---|
committer | link0ff <juri@linkov.net> | 2019-03-14 17:43:30 +0200 |
commit | 54e7087ab412a488f8ad7286aef89d313e5e7b14 (patch) | |
tree | 9391107eb5aec3940bf6150539acc38e85224751 /test/support/builders/user_builder.ex | |
parent | 9338f061a303ae3d57a8ea1af524c2ca51929f8d (diff) | |
parent | 59333f2d568dc6e50fb72e5114ec7dd6bcc1ebef (diff) | |
download | pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.tar.gz pleroma-54e7087ab412a488f8ad7286aef89d313e5e7b14.zip |
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
Diffstat (limited to 'test/support/builders/user_builder.ex')
-rw-r--r-- | test/support/builders/user_builder.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/support/builders/user_builder.ex b/test/support/builders/user_builder.ex index 611a5be18..f58e1b0ad 100644 --- a/test/support/builders/user_builder.ex +++ b/test/support/builders/user_builder.ex @@ -1,6 +1,6 @@ defmodule Pleroma.Builders.UserBuilder do - alias Pleroma.User alias Pleroma.Repo + alias Pleroma.User def build(data \\ %{}) do user = %User{ |