From: kaniini <nenolod@gmail.com>
Date: Sat, 26 Jan 2019 15:47:52 +0000 (+0000)
Subject: Merge branch 'features/mastoapi-cards' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=e91f867cc9f372da2262a3ac95a23bc12266595a;p=akkoma

Merge branch 'features/mastoapi-cards' into 'develop'

MastoAPI: Add Rich-Media support

See merge request pleroma/pleroma!664
---

e91f867cc9f372da2262a3ac95a23bc12266595a