Merge branch 'fix/downgraded-deps' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Thu, 7 May 2020 11:47:11 +0000 (11:47 +0000)
committerrinpatch <rinpatch@sdf.org>
Thu, 7 May 2020 11:47:11 +0000 (11:47 +0000)
commitb7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e
treebed9ea2207ccb3a4c0dacf6384a2352185c1842d
parent4c92dfb73ef1f40438adf5da009499205a677912
parent9c3c142c32b027addd7b729229820f8b2bf76994
Merge branch 'fix/downgraded-deps' into 'develop'

Restore mix.lock after 2FA merge

See merge request pleroma/pleroma!2487