From: kaniini <nenolod@gmail.com>
Date: Tue, 27 Nov 2018 22:59:01 +0000 (+0000)
Subject: Merge branch 'chore/mix-lock-update' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=02e43d44;p=akkoma

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

Add ex_doc & makeup_elixir to mix.lock

See merge request pleroma/pleroma!480
---

02e43d44d34b3fbe3e3d3d0eaf350e0208464f14