projects / akkoma / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d761b15 c621018)
Merge branch 'mastodon-emoji-endpoint' into 'develop'
authorlambda <pleromagit@rogerbraun.net>
Tue, 7 Nov 2017 20:01:15 +0000 (20:01 +0000)
committerlambda <pleromagit@rogerbraun.net>
Tue, 7 Nov 2017 20:01:15 +0000 (20:01 +0000)
Add mastodon API endpoint for custom emoji.

See merge request pleroma/pleroma!8

1  2 
lib/pleroma/formatter.ex patch | diff1 | diff2 | blob | history
lib/pleroma/web/router.ex patch | diff1 | diff2 | blob | history

diff --cc lib/pleroma/formatter.ex
Simple merge
diff --cc lib/pleroma/web/router.ex
Simple merge
Fork of https://akkoma.dev/AkkomaGang/akkoma.git