From: rinpatch <rinpatch@sdf.org>
Date: Fri, 18 Jan 2019 15:31:25 +0000 (+0300)
Subject: Fix merge conflict
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=74346a7035d950ede143d65f8364194cb116aaf5;p=akkoma

Fix merge conflict
---

74346a7035d950ede143d65f8364194cb116aaf5