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

2a744cdf

Commit 2a744cdf authored 7 years ago by lain

Downloads
- Plain Diff

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

parents f1f79c0d 29c98127

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 2 additions, 2 deletions

lib/pleroma/web/router.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 6 additions, 4 deletions

lib/pleroma/web/twitter_api/twitter_api_controller.ex
test/web/twitter_api/twitter_api_controller_test.exs 31 additions, 1 deletion

test/web/twitter_api/twitter_api_controller_test.exs

with 39 additions and 7 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