From: Dessalines <tyhou13@gmx.com>
Date: Sun, 19 Jan 2020 14:09:00 +0000 (-0500)
Subject: Merge remote-tracking branch 'nutomic/websocket-generics' into dessalines-http-api
X-Git-Url: http://these/git/?a=commitdiff_plain;h=8bf5aa6bfb7c01af53f99e4f2d70769afb66fcac;p=lemmy.git

Merge remote-tracking branch 'nutomic/websocket-generics' into dessalines-http-api
---

8bf5aa6bfb7c01af53f99e4f2d70769afb66fcac