Jay 3e0954db22 Fixed merge conflicts

2022-04-01 20:41:47 +02:00

..

adapters

Merge branch 'fix#1603' of https://github.com/Tivix/axios into Tivix-fix#1603

2022-04-01 19:57:44 +02:00

cancel

Refactored AxiosError to a constructor;

2021-10-14 19:15:16 +03:00

core

Fixed merge conflicts

2022-04-01 18:40:12 +02:00

defaults

Fixed some imports that were not correct

2022-04-01 18:48:36 +02:00

env

Fixed issues created when merging 0.26.1

2022-03-19 14:36:42 +02:00

helpers

Fixed merge conflicts

2022-04-01 20:41:47 +02:00

axios.js

Fixed merge conflicts

2022-04-01 18:40:12 +02:00

utils.js

Fixed merge conflicts

2022-04-01 18:40:12 +02:00