diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-01-27 14:28:51 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-01-27 14:28:51 +0000 |
| commit | 6c41c54d1b3e2e7854dc7f180c692066863f92a0 (patch) | |
| tree | 3ffd6ecff8855e91154dce9657e263bb71663187 | |
| parent | 5eb81d2c72c593d5b7dfb893827c0685467c21ca (diff) | |
| parent | 37520e1e793aa190a4e32a937c3ea80481eafc08 (diff) | |
| download | pleroma-6c41c54d1b3e2e7854dc7f180c692066863f92a0.tar.gz | |
Merge branch 'docs/emoji-endpoint-similarities' into 'develop'
docs/Pleroma-API.md: Add note about emoji endpoints similarities
See merge request pleroma/pleroma!720
| -rw-r--r-- | docs/Pleroma-API.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/Pleroma-API.md b/docs/Pleroma-API.md index da58babf9..0c4586dd3 100644 --- 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. |