logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 6c41c54d1b3e2e7854dc7f180c692066863f92a0
parent: 5eb81d2c72c593d5b7dfb893827c0685467c21ca
Author: rinpatch <rinpatch@sdf.org>
Date:   Sun, 27 Jan 2019 14:28:51 +0000

Merge branch 'docs/emoji-endpoint-similarities' into 'develop'

docs/Pleroma-API.md: Add note about emoji endpoints similarities

See merge request pleroma/pleroma!720

Diffstat:

Mdocs/Pleroma-API.md1+
1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/docs/Pleroma-API.md b/docs/Pleroma-API.md @@ -15,6 +15,7 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi * Params: none * Response: JSON * Example response: `{"kalsarikannit_f":"/finmoji/128px/kalsarikannit_f-128.png","perkele":"/finmoji/128px/perkele-128.png","blobdab":"/emoji/blobdab.png","happiness":"/finmoji/128px/happiness-128.png"}` +* Note: Same data as Mastodon API’s `/api/v1/custom_emojis` but in a different format ## `/api/pleroma/follow_import` ### Imports your follows, for example from a Mastodon CSV file.