Merge branch 'develop' into 'develop'
authorlambadalambda <gitgud@rogerbraun.net>
Fri, 20 Oct 2017 14:35:03 +0000 (10:35 -0400)
committerlambadalambda <gitgud@rogerbraun.net>
Fri, 20 Oct 2017 14:35:03 +0000 (10:35 -0400)
commitd0d50f8a6b1d22b4c45f7e2c2b2757d188f29349
treecdefa4c3313b03c01fb960c49b8bbce1e7b33450
parent38f3908c14d3b8fcfe522d4c92bde022dcc682e3
parentfe7804e42d27ca46290cfe52ffc01d4e520849b5
Merge branch 'develop' into 'develop'

Add an API endpoint for emoji.

See merge request lambadalambda/pleroma!28