Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

be67db55

Commit be67db55 authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'mastodon-emoji-endpoint' into 'develop'

Add mastodon API endpoint for custom emoji.

See merge request pleroma/pleroma!8

parents d761b154 c6210183

Branches

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/formatter.ex 0 additions, 1 deletion

lib/pleroma/formatter.ex
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 13 additions, 0 deletions

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/router.ex 1 addition, 0 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 1 addition, 1 deletion

lib/pleroma/web/twitter_api/controllers/util_controller.ex

with 15 additions and 2 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment