From: Dessalines <tyhou13@gmx.com>
Date: Tue, 8 Oct 2019 02:13:46 +0000 (-0700)
Subject: Merge branch 'zacanger-feat/k8s'
X-Git-Url: http://these/git/%7B%60%24%7BghostArchiveUrl%7D/static/readmes/%24%7BgetStaticDir%28%29%7D/js/%7B%60%24%7BarchiveTodayUrl%7D/?a=commitdiff_plain;h=f356a358844197d29eda2fa44128c48e852f46c2;p=lemmy.git

Merge branch 'zacanger-feat/k8s'
---

f356a358844197d29eda2fa44128c48e852f46c2