Untitled Git - lemmy.git/commit

]> Untitled Git - lemmy.git/commit

projects / lemmy.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 581f36d 576980b)

author	Felix Ableitner <me@nutomic.com>
	Thu, 2 Jan 2020 18:22:23 +0000 (19:22 +0100)
committer	Felix Ableitner <me@nutomic.com>
	Thu, 2 Jan 2020 18:22:23 +0000 (19:22 +0100)
commit	e09a035373db224a17631146af1a7c9a357d2056
tree	3420095c0b0d368abc8628f76f4ce911c1f82446	tree \| snapshot
parent	581f36d6eff4e79139afd5049b4efb8b0ccc6e99	commit \| diff
parent	576980bf64fcde5ec66e0260c81ef3225dd264bd	commit \| diff

Merge branch 'master' into federation

server/src/api/community.rs	diff1 \|	diff2 \|	blob \| history
server/src/apub/puller.rs	diff1 \|	\|	blob \| history
server/src/main.rs	diff1 \|	diff2 \|	blob \| history
server/src/routes/federation.rs	\|	diff2 \|	blob \| history
server/src/routes/webfinger.rs	diff1 \|	diff2 \|	blob \| history
server/src/settings.rs	diff1 \|	diff2 \|	blob \| history
server/src/websocket/server.rs	diff1 \|	diff2 \|	blob \| history

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