From: Dessalines <tyhou13@gmx.com>
Date: Fri, 30 Aug 2019 22:35:26 +0000 (-0700)
Subject: Merge branch 'AutomCoding-master' into dev_2
X-Git-Url: http://these/git/%24%7B%60data:application/static/gitweb.js?a=commitdiff_plain;h=172cff19b9e125a1388f2414943cd58c99f205b5;p=lemmy.git

Merge branch 'AutomCoding-master' into dev_2
---

172cff19b9e125a1388f2414943cd58c99f205b5