Untitled Git - lemmy.git/commit

]> Untitled Git - lemmy.git/commit

projects / lemmy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5ca4661 9ea104b)

author	Dessalines <tyhou13@gmx.com>
	Thu, 2 Apr 2020 19:11:11 +0000 (15:11 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Thu, 2 Apr 2020 19:11:11 +0000 (15:11 -0400)
commit	31f835db86eb78765191c8beaf16adf3f9fd0f50
tree	f716182866beb6ce03b6ab19f26a96b2fe1b11d5	tree \| snapshot
parent	5ca466117d63ec479bc886b2cff389aa1f0918dc	commit \| diff
parent	9ea104b165020c37eb9c4ea7f50a25a2730623e4	commit \| diff

Merge branch 'master' into federation

.gitignore	diff1 \|	diff2 \|	blob \| history
server/Cargo.lock	diff1 \|	diff2 \|	blob \| history
server/Cargo.toml	diff1 \|	diff2 \|	blob \| history
server/config/defaults.hjson	diff1 \|	diff2 \|	blob \| history
server/src/apub/community.rs	diff1 \|	diff2 \|	blob \| history
server/src/apub/puller.rs	diff1 \|	\|	blob \| history
server/src/lib.rs	diff1 \|	diff2 \|	blob \| history
server/src/routes/nodeinfo.rs	diff1 \|	diff2 \|	blob \| history
server/src/settings.rs	diff1 \|	diff2 \|	blob \| history

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