From: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date: Sun, 9 Dec 2018 13:53:20 +0000 (+0000)
Subject: Merge branch 'angristan-docker' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cf85a9aea1949677a092c0ebc6c0e17475346632;p=akkoma

Merge branch 'angristan-docker' into 'develop'

Update angristan/docker-pleroma URL in README

See merge request pleroma/pleroma!526
---

cf85a9aea1949677a092c0ebc6c0e17475346632