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)
commite91f867cc9f372da2262a3ac95a23bc12266595a
tree359cefdf58a23900353015b36b0bdb3c33c35a93
parentc00fba4f7dcf10c49bf1fa03be348e7c99a3fc47
parent1f7843b9b8afcb559c8ba59388724dbf4ef3e3c9
Merge branch 'features/mastoapi-cards' into 'develop'

MastoAPI: Add Rich-Media support

See merge request pleroma/pleroma!664