Untitled Git - lemmy.git/commit

]> Untitled Git - lemmy.git/commit

projects / lemmy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2f4b3a4 b98fa12)

author	Dessalines <tyhou13@gmx.com>
	Tue, 21 Apr 2020 14:25:29 +0000 (10:25 -0400)
committer	Dessalines <tyhou13@gmx.com>
	Tue, 21 Apr 2020 14:25:29 +0000 (10:25 -0400)
commit	f0026065f5f809d2038ca91d7880becb39b0f9a7
tree	fdb76bb60d89bc56f1e60deaa2a5d62fb5a9edc8	tree \| snapshot
parent	2f4b3a4f833ce277ab989626a6210167ce47c29e	commit \| diff
parent	b98fa1274151f61b13679aa30f332686bc9645f3	commit \| diff

Merge branch 'master' into federation_merge_from_master_1

14 files changed:

server/Cargo.lock	diff1 \|	diff2 \|	blob \| history
server/Cargo.toml	diff1 \|	diff2 \|	blob \| history
server/src/api/comment.rs	diff1 \|	diff2 \|	blob \| history
server/src/api/community.rs	diff1 \|	diff2 \|	blob \| history
server/src/api/mod.rs	diff1 \|	diff2 \|	blob \| history
server/src/api/post.rs	diff1 \|	diff2 \|	blob \| history
server/src/api/site.rs	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/federation.rs	diff1 \|	diff2 \|	blob \| history
server/src/routes/mod.rs	diff1 \|	diff2 \|	blob \| history
server/src/routes/nodeinfo.rs	diff1 \|	diff2 \|	blob \| history
server/src/routes/webfinger.rs	diff1 \|	diff2 \|	blob \| history

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