projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38f3908 fe7804e)
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)
Add an API endpoint for emoji.

See merge request lambadalambda/pleroma!28


Trivial merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git