From: lain <lain@soykaf.club>
Date: Mon, 13 Jan 2020 15:25:41 +0000 (+0000)
Subject: Merge branch 'feature/ci-registry' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=12b28c8925c2c55e0d7bb66ff3320532a1aade3b;p=akkoma

Merge branch 'feature/ci-registry' into 'develop'

Update Dockerfile with labels. Update gitlab-ci for registry usage

See merge request pleroma/pleroma!2098
---

12b28c8925c2c55e0d7bb66ff3320532a1aade3b