Merge branch 'develop' into fix/twittercards
authorMark Felder <feld@FreeBSD.org>
Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)
committerMark Felder <feld@FreeBSD.org>
Tue, 19 Feb 2019 16:58:28 +0000 (16:58 +0000)
commit2d21ea1a0e1be2e737dc4d283e72207580856214
treef377cf25c36de97d664f13cebacb6ff2e0d43b91
parent10a11f083ca543022c61e24b1ec0cc83811d6d06
parent1dd718e83c76db218f12a98344b568fe10ecbefe
Merge branch 'develop' into fix/twittercards
lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex