Merge branch 'official-docker-support' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:12:03 +0000 (18:12 +0000)
committerkaniini <ariadne@dereferenced.org>
Sat, 3 Aug 2019 18:12:03 +0000 (18:12 +0000)
commitba72d02f86d229ae83d4ca669e548b9968bdf8dd
treee2a1b26787c5f42fd7a318a2ff96527f90574ddd
parente553a17e98394ecdd64908ab524a192f1b2390bf
parent4007717534f9cc880b808b91ba6be5801afb71a0
Merge branch 'official-docker-support' into 'develop'

Add Dockerfile

See merge request pleroma/pleroma!1523