Merge branch 'fix/twittercards' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 22 Feb 2019 04:38:14 +0000 (04:38 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 22 Feb 2019 04:38:14 +0000 (04:38 +0000)
commit5a4e2905fecfd21cf92f6b2844f15f5ee84b33f5
tree3e3daf6bc2a1ec54d632760b2f0910c85b8da377
parenteeeb8124b95871853ec41f3ccf44f6168713a8d8
parentf4bfc628ca16582ee064a2753e6a32fd891803d4
Merge branch 'fix/twittercards' into 'develop'

Fix Twitter Cards

See merge request pleroma/pleroma!815
lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/router.ex