diff options
author | kaniini <nenolod@gmail.com> | 2019-01-01 20:12:34 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-01-01 20:12:34 +0000 |
commit | 32bed664714c616d4a75579b450e52dcff5d8134 (patch) | |
tree | 88d5c48035cf1cb874c14caeb9f3ae33cff5c71e /test | |
parent | 34fa7090158315eb0c8304c6b496f23338f9e1c6 (diff) | |
parent | 096a92780541e76229400ad9ee5b990b5e1b4d1f (diff) | |
download | pleroma-32bed664714c616d4a75579b450e52dcff5d8134.tar.gz pleroma-32bed664714c616d4a75579b450e52dcff5d8134.zip |
Merge branch 'pool-usage' into 'develop'
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
Diffstat (limited to 'test')
0 files changed, 0 insertions, 0 deletions