Merge branch 'chore/mix-lock-update' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 27 Nov 2018 22:59:01 +0000 (22:59 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 27 Nov 2018 22:59:01 +0000 (22:59 +0000)
commit02e43d44d34b3fbe3e3d3d0eaf350e0208464f14
tree6dccb090d018042346c5f3d85f8451062dd54889
parent41ff86ca1d56868d51af0a4411beec4f63fa6ba0
parent0314f04c2a40180a5139497785dcbd4b3f6e8c13
Merge branch 'chore/mix-lock-update' into 'develop'

Add ex_doc & makeup_elixir to mix.lock

See merge request pleroma/pleroma!480