Merge branch 'fix-docker-build' into 'develop'
authorlain <lain@soykaf.club>
Wed, 20 Nov 2019 10:32:58 +0000 (10:32 +0000)
committerlain <lain@soykaf.club>
Wed, 20 Nov 2019 10:32:58 +0000 (10:32 +0000)
commit75efdb0781bcaf4b685dbba0d218cb158fc3fcaf
treef697cd99f850373f90134ea7c5050b3dcbce58f2
parent27f73d38c019cd8b5b16817b20467e0e7dcbd75a
parentb7bbb5445d2d5afc998c092c0bc558455be87faf
Merge branch 'fix-docker-build' into 'develop'

Fix failing docker build

See merge request pleroma/pleroma!1998