From: kaniini <nenolod@gmail.com>
Date: Tue, 27 Nov 2018 23:20:12 +0000 (+0000)
Subject: Merge branch 'revert-02e43d44' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7049ed593698b46a14d8f88537d470b3a306f79b;p=akkoma

Merge branch 'revert-02e43d44' into 'develop'

Revert "Merge branch 'chore/mix-lock-update' into 'develop'"

See merge request pleroma/pleroma!481
---

7049ed593698b46a14d8f88537d470b3a306f79b