From: lambda <pleromagit@rogerbraun.net>
Date: Mon, 2 Apr 2018 11:24:12 +0000 (+0000)
Subject: Merge branch 'fix-107' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=807d243c64e6cc481f465e4b54fada0f2f66cb9f;p=akkoma

Merge branch 'fix-107' into 'develop'

masto api: run emojis through mediaproxy

Closes #107

See merge request pleroma/pleroma!92
---

807d243c64e6cc481f465e4b54fada0f2f66cb9f