From: Dessalines <tyhou13@gmx.com>
Date: Sat, 18 Jan 2020 18:42:40 +0000 (-0500)
Subject: Merge branch 'code-of-conduct' of https://github.com/Nutomic/lemmy into Nutomic-code... 
X-Git-Url: http://these/git/%7B%60/feeds/%24%7BgetStaticDir%28%29%7D/styles/styles.css?a=commitdiff_plain;h=882404c3a6cb584c0124071bfa9cd465c92ce74a;p=lemmy.git

Merge branch 'code-of-conduct' of https://github.com/Nutomic/lemmy into Nutomic-code-of-conduct
---

882404c3a6cb584c0124071bfa9cd465c92ce74a