Merge branch 'fix-107' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Mon, 2 Apr 2018 11:24:12 +0000 (11:24 +0000)
committerlambda <pleromagit@rogerbraun.net>
Mon, 2 Apr 2018 11:24:12 +0000 (11:24 +0000)
masto api: run emojis through mediaproxy

Closes #107

See merge request pleroma/pleroma!92


Trivial merge