Merge branch 'bugfix/mix-lock' into 'develop'
authorkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 23:35:39 +0000 (23:35 +0000)
committerkaniini <nenolod@gmail.com>
Thu, 16 Aug 2018 23:35:39 +0000 (23:35 +0000)
commit03966bb0f77295f9c597619ebecbc0b499b5d065
tree805a820b273252efc1fdcdc6c4f56a154543865a
parent8c3880f18cb8bb8d8108082436b2ccff28589f51
parent0835cf9faa2adcc5ce3844c64198b09d50e5c637
Merge branch 'bugfix/mix-lock' into 'develop'

update mix.lock

See merge request pleroma/pleroma!273