projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'flake-from-int' into 'develop'
[akkoma]
/
test
/
support
/
builders
/
user_builder.ex
diff --git
a/test/support/builders/user_builder.ex
b/test/support/builders/user_builder.ex
index 1e1e80ac9a96a4031275c7716fed1eeef282ab44..7a1ca79b50540347a0cdef9eba7c7be720c7d6bb 100644
(file)
--- a/
test/support/builders/user_builder.ex
+++ b/
test/support/builders/user_builder.ex
@@
-10,6
+10,7
@@
defmodule Pleroma.Builders.UserBuilder do
bio: "A tester.",
ap_id: "some id"
}
+
Map.merge(user, data)
end