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

da9cbf2c

Commit da9cbf2c authored 6 years ago by lain

Downloads
- Plain Diff

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

parents 5e76adb0 dca1d6d1

Branches

Tags

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex 5 additions, 1 deletion

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/twitter_api/twitter_api_controller.ex 4 additions, 4 deletions

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

test/web/twitter_api/twitter_api_controller_test.exs

with 11 additions and 5 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