2
0
mirror of https://github.com/tenrok/axios.git synced 2026-06-11 18:02:32 +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
5 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -4,8 +4,8 @@
"description": "Promise based HTTP client for the browser and node.js",
"main": "index.js",
"scripts": {
"build": "grunt build",
"test": "grunt test",
"build": "./node_modules/.bin/grunt build",
"test": "./node_modules/.bin/grunt test",
"start": "node ./sandbox/server.js",
"examples": "node ./examples/server.js",
"coveralls": "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js"