From: Karen Konou <konoukaren@gmail.com>
Date: Thu, 7 Feb 2019 22:47:13 +0000 (+0100)
Subject: resolved merge conflict
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=97a2789caa5d269975da22a2153de22b7978ad36;p=akkoma

resolved merge conflict
---

97a2789caa5d269975da22a2153de22b7978ad36