Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 20 Jul 2019 13:09:38 +0000 (13:09 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 20 Jul 2019 13:09:38 +0000 (13:09 +0000)
commitfe548f322e834c7c81678a460c54c71f1198021c
tree08ae6a155f7b161f64768d16246a9890fb84ac25
parent6e99e7c774d5e8b6e881810c506cfd9dce2a6107
parentd0198fe215a7542ce506e40e1e4860a27ee2d01e
Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'

[#1112] Preserving `id` on user insert conflict

Closes #1112

See merge request pleroma/pleroma!1456