From: kaniini <ariadne@dereferenced.org>
Date: Sat, 20 Jul 2019 13:09:38 +0000 (+0000)
Subject: Merge branch '1112-user-insert-conflict-id-preservation' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fe548f322e834c7c81678a460c54c71f1198021c;p=akkoma

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
---

fe548f322e834c7c81678a460c54c71f1198021c