From: Dessalines <tyhou13@gmx.com>
Date: Fri, 15 Jan 2021 17:28:21 +0000 (-0600)
Subject: Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker
X-Git-Url: http://these/git/%22https:/join-lemmy.org/%7B%60/feeds/all.xml?a=commitdiff_plain;h=edf0fd438176650b00a4659ad783c037dc078836;p=lemmy.git

Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker
---

edf0fd438176650b00a4659ad783c037dc078836