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)
commit807d243c64e6cc481f465e4b54fada0f2f66cb9f
tree4d6ce9c817fb1c2bef16a0ba70927b9c6b2260ee
parentcd543d58a1b8ddf0f41a39800dc7a18321cd3250
parent5e4bb4ad925d1f9b194f07a27e3ecc21e821a051
Merge branch 'fix-107' into 'develop'

masto api: run emojis through mediaproxy

Closes #107

See merge request pleroma/pleroma!92