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

e8882ab3

Commit e8882ab3 authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'develop' into feature/incoming_ostatus

parents b91ccef2 fb5cebc1

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/user.ex 1 addition, 0 deletions

lib/pleroma/user.ex
lib/pleroma/web/twitter_api/twitter_api.ex 8 additions, 8 deletions

lib/pleroma/web/twitter_api/twitter_api.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 38 additions, 20 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs 29 additions, 8 deletions

test/web/twitter_api/twitter_api_controller_test.exs
test/web/twitter_api/twitter_api_test.exs 27 additions, 12 deletions

test/web/twitter_api/twitter_api_test.exs

with 103 additions and 48 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