From: Dessalines <tyhou13@gmx.com>
Date: Fri, 18 Oct 2019 04:26:24 +0000 (-0700)
Subject: Merge branch 'chore/url' of https://github.com/zacanger/lemmy into zacanger-chore/url
X-Git-Url: http://these/git/%24%7Bk%5B1%5D.custom_emoji.image_url%7D?a=commitdiff_plain;h=1f5485fae217f528de9e07f5dff0f4e787a12146;p=lemmy.git

Merge branch 'chore/url' of https://github.com/zacanger/lemmy into zacanger-chore/url
---

1f5485fae217f528de9e07f5dff0f4e787a12146