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

32bed664

Commit 32bed664 authored 6 years ago by kaniini

Downloads
- Plain Diff

Merge branch 'pool-usage' into 'develop'

Update of hackney and tesla, removal of superflous default options.

See merge request pleroma/pleroma!614

parents 34fa7090 096a9278

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

lib/pleroma/http/connection.ex 0 additions, 1 deletion

lib/pleroma/http/connection.ex
lib/pleroma/http/http.ex 0 additions, 1 deletion

lib/pleroma/http/http.ex
lib/pleroma/web/activity_pub/activity_pub.ex 1 addition, 2 deletions

lib/pleroma/web/activity_pub/activity_pub.ex
mix.lock 8 additions, 8 deletions

mix.lock

with 9 additions and 12 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