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

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

Browse Source 
Conflicts:
	package.json
This commit is contained in:
Vineet Hawal
2015-11-22 00:17:24 +05:30
parent 1eac0b1b21 7fa69152e9
commit 729ff05112
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/adapters/xhr.js
+1 -1
View File
@@ -4,7 +4,7 @@
var defaults = require('./../defaults');
var utils = require('./../utils');
var buildURL = require('./../helpers/buildUrl');
var buildURL = require('./../helpers/buildURL');
var parseHeaders = require('./../helpers/parseHeaders');
var transformData = require('./../helpers/transformData');
var isURLSameOrigin = require('./../helpers/isURLSameOrigin');