From: Dessalines <tyhou13@gmx.com>
Date: Wed, 13 Jan 2021 19:20:21 +0000 (-0500)
Subject: Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker
X-Git-Url: http://these/git/%7B%60%24%7BrepoUrl%7D/blob/master/docs/static/git-favicon.png?a=commitdiff_plain;h=15c5e5c502dec503b8748e0bc6bafc17fb83d71b;p=lemmy.git

Merge branch 'move_views_to_diesel' into remove_travis_and_federation_docker
---

15c5e5c502dec503b8748e0bc6bafc17fb83d71b