merge from dev

This commit is contained in:
Luke Pulverenti
2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions
+16
View File
@@ -0,0 +1,16 @@
{
"name": "fetch",
"main": "fetch.js",
"devDependencies": {
"es6-promise": "1.0.0"
},
"ignore": [
".*",
"*.md",
"examples/",
"Makefile",
"package.json",
"script/",
"test/"
]
}