Merge branch 'features/mastoapi-cards' into 'develop'
authorkaniini <nenolod@gmail.com>
Sat, 26 Jan 2019 15:47:52 +0000 (15:47 +0000)
committerkaniini <nenolod@gmail.com>
Sat, 26 Jan 2019 15:47:52 +0000 (15:47 +0000)
MastoAPI: Add Rich-Media support

See merge request pleroma/pleroma!664


Trivial merge