Merge branch 'release/2.1.0' into develop

author Chocobozzz <me@florianbigard.com>

Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)

committer Chocobozzz <me@florianbigard.com>

Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
author Chocobozzz <me@florianbigard.com>
Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
committer Chocobozzz <me@florianbigard.com>
Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
diff --cc client/src/app/core/server/server.service.ts
Simple merge
diff --cc server/lib/activitypub/actor.ts
Simple merge
author	Chocobozzz <me@florianbigard.com>
	Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
committer	Chocobozzz <me@florianbigard.com>
	Mon, 17 Feb 2020 14:34:42 +0000 (15:34 +0100)
		1	2
client/src/app/core/server/server.service.ts	patch \|	diff1 \|	diff2 \|	blob \| history
server/lib/activitypub/actor.ts	patch \|	diff1 \|	diff2 \|	blob \| history