From: lambadalambda <gitgud@rogerbraun.net>
Date: Fri, 20 Oct 2017 14:35:03 +0000 (-0400)
Subject: Merge branch 'develop' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349;p=akkoma

Merge branch 'develop' into 'develop'

Add an API endpoint for emoji.

See merge request lambadalambda/pleroma!28
---

d0d50f8a6b1d22b4c45f7e2c2b2757d188f29349