Merge branch 'revert-02e43d44' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 27 Nov 2018 23:20:12 +0000 (23:20 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 27 Nov 2018 23:20:12 +0000 (23:20 +0000)
commit7049ed593698b46a14d8f88537d470b3a306f79b
tree079e13f4f1b5ce9a02b45e28c59d5c0bfb09c5a8
parent02e43d44d34b3fbe3e3d3d0eaf350e0208464f14
parent4a019827b2a911fc9217e3ec57170e3fb6336600
Merge branch 'revert-02e43d44' into 'develop'

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

See merge request pleroma/pleroma!481