projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6e99e7c
d0198fe
)
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'
author
kaniini
<ariadne@dereferenced.org>
Sat, 20 Jul 2019 13:09:38 +0000
(13:09 +0000)
committer
kaniini
<ariadne@dereferenced.org>
Sat, 20 Jul 2019 13:09:38 +0000
(13:09 +0000)
[#1112] Preserving `id` on user insert conflict
Closes #1112
See merge request pleroma/pleroma!1456
Trivial merge
projects / akkoma / commitdiff