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

1eb7a862

Commit 1eb7a862 authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'twitterapi-show-user' into 'develop'

TwitterAPI: Add /users/show.

See merge request pleroma/pleroma!19

parents 0a696118 f9828e57

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

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

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 13 additions, 0 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs 40 additions, 0 deletions

test/web/twitter_api/twitter_api_controller_test.exs

with 54 additions and 0 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