Merge branch 'hardening/mastodon-rich-media' into 'develop'
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 26 Jan 2019 17:30:51 +0000 (17:30 +0000)
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>
Sat, 26 Jan 2019 17:30:51 +0000 (17:30 +0000)
rich media: minor hardening

See merge request pleroma/pleroma!717


Trivial merge