Untitled Git - lemmy.git/commit

]> Untitled Git - lemmy.git/commit

projects / lemmy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f040dac 641e4c5)

author	Dessalines <tyhou13@gmx.com>
	Tue, 14 Apr 2020 20:07:20 +0000 (16:07 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Tue, 14 Apr 2020 20:07:20 +0000 (16:07 -0400)
commit	1336b4ed6023e7fcf0fd40be63569966ee4b1b45
tree	e62e4422e0ba0430ea6d060f01d20dee22d6e564	tree \| snapshot
parent	f040dac647d50c97e3f9ab8058563a7fe0f29261	commit \| diff
parent	641e4c5d96d9d152bc75318b3ea08f789d920b2b	commit \| diff

Merge branch 'dev' into federation

18 files changed:

server/src/api/site.rs	diff1 \|	diff2 \|	blob \| history
server/src/lib.rs	diff1 \|	diff2 \|	blob \| history
server/src/main.rs	diff1 \|	diff2 \|	blob \| history
server/src/settings.rs	diff1 \|	diff2 \|	blob \| history
server/src/websocket/server.rs	diff1 \|	diff2 \|	blob \| history
ui/package.json	diff1 \|	diff2 \|	blob \| history
ui/src/components/comment-form.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/comment-node.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/navbar.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/post-form.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/post-listing.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/post.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/private-message-form.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/private-message.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/sidebar.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/interfaces.ts	diff1 \|	diff2 \|	blob \| history
ui/src/utils.ts	diff1 \|	diff2 \|	blob \| history
ui/yarn.lock	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.