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)
commit717579330427ed4f78ee578d008818c07106318f
tree3c83e62be0177e145cba86a6fe02c87ab98d8595
parentc410fe960cfc599b7ce425ad341f172780093fcf
parent8f2f471e948160f96549ca9744cca56f940a8658
Merge branch 'hardening/mastodon-rich-media' into 'develop'

rich media: minor hardening

See merge request pleroma/pleroma!717