]> Untitled Git - lemmy.git/commitdiff
Merge branch 'dev' into websocket_scopes
authorDessalines <tyhou13@gmx.com>
Sat, 1 Feb 2020 05:37:34 +0000 (00:37 -0500)
committerDessalines <tyhou13@gmx.com>
Sat, 1 Feb 2020 05:37:34 +0000 (00:37 -0500)
1  2 
ui/src/components/navbar.tsx
ui/src/services/WebSocketService.ts

Simple merge
Simple merge