From: Dessalines Date: Tue, 3 Mar 2020 14:24:24 +0000 (-0500) Subject: Merge branch 'dev' into icons X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%24%7B%60data:application/%22https:/hacktivis.me/%7BpictrsAvatarThumbnail%28this.props.site.site.icon%29%7D?a=commitdiff_plain;h=fe5bd0341a438a5e666e4abd2885b97a7813e49e;p=lemmy.git Merge branch 'dev' into icons --- fe5bd0341a438a5e666e4abd2885b97a7813e49e