2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-14 18:42:33 +03:00

Merge branch 'master' of github.com:mzabriskie/axios into xDomainRequestSupport

Conflicts:
	lib/adapters/xhr.js
This commit is contained in:
Vineet Hawal
2015-11-20 15:21:04 +05:30
19 changed files with 439 additions and 321 deletions
+3
View File
@@ -62,5 +62,8 @@
},
"typescript": {
"definition": "./axios.d.ts"
},
"dependencies": {
"follow-redirects": "0.0.7"
}
}