projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d3180e0
5b3480d
)
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate...
author
lain
<lain@soykaf.club>
Tue, 20 Nov 2018 19:16:16 +0000
(20:16 +0100)
committer
lain
<lain@soykaf.club>
Tue, 20 Nov 2018 19:16:16 +0000
(20:16 +0100)
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge