Merge branch 'pool-usage' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 1 Jan 2019 20:12:34 +0000 (20:12 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 1 Jan 2019 20:12:34 +0000 (20:12 +0000)
commit32bed664714c616d4a75579b450e52dcff5d8134
tree88d5c48035cf1cb874c14caeb9f3ae33cff5c71e
parent34fa7090158315eb0c8304c6b496f23338f9e1c6
parent096a92780541e76229400ad9ee5b990b5e1b4d1f
Merge branch 'pool-usage' into 'develop'

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

See merge request pleroma/pleroma!614