Merge branch 'develop' into issue/1383
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 4 Dec 2019 06:34:44 +0000 (09:34 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 4 Dec 2019 06:34:44 +0000 (09:34 +0300)
1  2 
lib/pleroma/workers/background_worker.ex
mix.lock

diff --cc mix.lock
Simple merge