aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/xml/xml.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-01-01 20:12:34 +0000
committerkaniini <nenolod@gmail.com>2019-01-01 20:12:34 +0000
commit32bed664714c616d4a75579b450e52dcff5d8134 (patch)
tree88d5c48035cf1cb874c14caeb9f3ae33cff5c71e /lib/pleroma/web/xml/xml.ex
parent34fa7090158315eb0c8304c6b496f23338f9e1c6 (diff)
parent096a92780541e76229400ad9ee5b990b5e1b4d1f (diff)
downloadpleroma-32bed664714c616d4a75579b450e52dcff5d8134.tar.gz
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 'lib/pleroma/web/xml/xml.ex')
0 files changed, 0 insertions, 0 deletions