From: kaniini <nenolod@gmail.com>
Date: Thu, 16 Aug 2018 23:35:39 +0000 (+0000)
Subject: Merge branch 'bugfix/mix-lock' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=03966bb0f77295f9c597619ebecbc0b499b5d065;p=akkoma

Merge branch 'bugfix/mix-lock' into 'develop'

update mix.lock

See merge request pleroma/pleroma!273
---

03966bb0f77295f9c597619ebecbc0b499b5d065