Untitled Git - lemmy.git/commit

]> Untitled Git - lemmy.git/commit

projects / lemmy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5c6601c a13e9fe)

author	Felix Ableitner <me@nutomic.com>
	Tue, 9 Jun 2020 12:01:26 +0000 (14:01 +0200)
committer	Felix Ableitner <me@nutomic.com>
	Tue, 9 Jun 2020 12:01:26 +0000 (14:01 +0200)
commit	0f1a8ec928a36d73490a41a778244578f39dd626
tree	e55ec80acbb258197ce899cefe6e1b24e09ad2fb	tree \| snapshot
parent	5c6601cb2a819d20b0f0d17f3575aff006a47fd2	commit \| diff
parent	a13e9fe3959e07f901ba0647dfd7f749865a900d	commit \| diff

Merge branch 'master' into federation

16 files changed:

README.md	diff1 \|	diff2 \|	blob \| history
docker/dev/docker-compose.yml	diff1 \|	diff2 \|	blob \| history
docs/src/contributing_federation_development.md	diff1 \|	diff2 \|	blob \| history
server/Cargo.toml	diff1 \|	diff2 \|	blob \| history
server/src/api/user.rs	diff1 \|	diff2 \|	blob \| history
server/src/lib.rs	diff1 \|	diff2 \|	blob \| history
server/src/main.rs	diff1 \|	diff2 \|	blob \| history
server/src/routes/websocket.rs	diff1 \|	diff2 \|	blob \| history
ui/src/components/comment-node.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/main.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/private-message-form.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/sidebar.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/components/user.tsx	diff1 \|	diff2 \|	blob \| history
ui/src/utils.ts	diff1 \|	diff2 \|	blob \| history

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