From: kaniini <nenolod@gmail.com>
Date: Thu, 16 Aug 2018 15:45:12 +0000 (+0000)
Subject: Merge branch 'patch-2' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=8c3880f18cb8bb8d8108082436b2ccff28589f51;p=akkoma

Merge branch 'patch-2' into 'develop'

Update mix.exs

See merge request pleroma/pleroma!241
---

8c3880f18cb8bb8d8108082436b2ccff28589f51