Merge branch 'master' of github.com:mzabriskie/axios into xDomainRequestSupport · 729ff05112 - axios - Gitea: Git with a cup of tea

mirrors/axios

mirror of https://github.com/tenrok/axios.git synced 2026-06-08 17:22:34 +03:00

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

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

									
										test/specs/helpers/buildUrl.spec.js → test/specs/helpers/buildURL.spec.js
									
		+1
		
												View File
												
				@@ -63,3 +63,4 @@ describe('helpers::buildURL', function () {

				  })

				});