From: Dessalines <tyhou13@gmx.com>
Date: Sat, 1 Jun 2019 17:30:15 +0000 (-0700)
Subject: Merge branch 'use-local-assets' of https://github.com/Perflyst/lemmy into Perflyst... 
X-Git-Url: http://these/git/%22https:/nerdica.net/%7B%24%7B%60data:application/static/%7Biframely.url%7D?a=commitdiff_plain;h=0cf0569f4d363124c41426dc9c6e482bc296f253;p=lemmy.git

Merge branch 'use-local-assets' of https://github.com/Perflyst/lemmy into Perflyst-use-local-assets
---

0cf0569f4d363124c41426dc9c6e482bc296f253