Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

0eff6349

Commit 0eff6349 authored 5 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'release/1.0.3' into 'master'

1.0.3 release

See merge request pleroma/pleroma!1514

parents cca9d64c 2536628c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 6 additions, 1 deletion

CHANGELOG.md
lib/pleroma/web/ostatus/handlers/follow_handler.ex 5 additions, 1 deletion

lib/pleroma/web/ostatus/handlers/follow_handler.ex
lib/pleroma/web/ostatus/handlers/note_handler.ex 1 addition, 1 deletion

lib/pleroma/web/ostatus/handlers/note_handler.ex
lib/pleroma/web/ostatus/handlers/unfollow_handler.ex 1 addition, 1 deletion

lib/pleroma/web/ostatus/handlers/unfollow_handler.ex
lib/pleroma/web/ostatus/ostatus.ex 12 additions, 5 deletions

lib/pleroma/web/ostatus/ostatus.ex
lib/pleroma/web/twitter_api/controllers/util_controller.ex 2 additions, 5 deletions

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

mix.exs
test/web/ostatus/ostatus_test.exs 53 additions, 3 deletions

test/web/ostatus/ostatus_test.exs

with 81 additions and 18 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