Merge branch 'hotfix/prismo-twitterapi' into 'develop'
authorHaelwenn <git.pleroma.social@hacktivis.me>
Thu, 1 Nov 2018 14:14:05 +0000 (14:14 +0000)
committerHaelwenn <git.pleroma.social@hacktivis.me>
Thu, 1 Nov 2018 14:14:05 +0000 (14:14 +0000)
commitf114f843248d207ff240b018a774ce32c34b6eaf
treecc8bba0031422f1bcc8f33c7e6cc9fc9d7e2b826
parent4fab4e9ba44cdedccb9cf92a0d9b590a654bba69
parent3c7d4ff27100420f69e68fb256a2181a1a35a4a7
Merge branch 'hotfix/prismo-twitterapi' into 'develop'

Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo

Closes #353

See merge request pleroma/pleroma!415