From: Dessalines <tyhou13@gmx.com>
Date: Fri, 6 Dec 2019 23:00:44 +0000 (-0800)
Subject: Merge branch 'teromene-config_dif_addr'
X-Git-Url: http://these/git/%7B%60/feeds/inbox/static/%7BpictrsAvatarThumbnail%28user.avatar%29%7D?a=commitdiff_plain;h=6afcf3242241626ad7ed1227688065e40538565d;p=lemmy.git

Merge branch 'teromene-config_dif_addr'
---

6afcf3242241626ad7ed1227688065e40538565d