mime-db@1.15.0

4 files changed, 53 insertions, 22 deletions

diff --git a/node_modules/mime-db/HISTORY.md b/node_modules/mime-db/HISTORY.md
index 415a8cf6c..fa40614d9 100644
--- a/node_modules/mime-db/HISTORY.md
+++ b/node_modules/mime-db/HISTORY.md
@@ -1,3 +1,16 @@
+1.15.0 / 2015-07-13
+===================
+
+  * Add `application/x-httpd-php`
+
+1.14.0 / 2015-06-25
+===================
+
+  * Add `application/scim+json`
+  * Add `application/vnd.3gpp.ussd+xml`
+  * Add `application/vnd.biopax.rdf+xml`
+  * Add `text/x-processing`
+
 1.13.0 / 2015-06-07
 ===================
 
diff --git a/node_modules/mime-db/README.md b/node_modules/mime-db/README.md
index faf387f96..164cca030 100644
--- a/node_modules/mime-db/README.md
+++ b/node_modules/mime-db/README.md
@@ -62,7 +62,7 @@ If unknown, every property could be `undefined`.
 To edit the database, only make PRs against `src/custom.json` or
 `src/custom-suffix.json`.
 
-To update the build, run `npm run update`.
+To update the build, run `npm run build`.
 
 ## Adding Custom Media Types
 
diff --git a/node_modules/mime-db/db.json b/node_modules/mime-db/db.json
index 27cb4a1b0..2f2dc448e 100644
--- a/node_modules/mime-db/db.json
+++ b/node_modules/mime-db/db.json
@@ -937,6 +937,10 @@
   "application/scaip+xml": {
     "source": "iana"
   },
+  "application/scim+json": {
+    "source": "iana",
+    "compressible": true
+  },
   "application/scvp-cv-request": {
     "source": "iana",
     "extensions": ["scq"]
@@ -1162,6 +1166,9 @@
   "application/vnd.3gpp.sms": {
     "source": "iana"
   },
+  "application/vnd.3gpp.ussd+xml": {
+    "source": "iana"
+  },
   "application/vnd.3gpp2.bcmcsinfo+xml": {
     "source": "iana"
   },
@@ -1323,6 +1330,9 @@
     "source": "iana",
     "compressible": true
   },
+  "application/vnd.biopax.rdf+xml": {
+    "source": "iana"
+  },
   "application/vnd.blueice.multipass": {
     "source": "iana",
     "extensions": ["mpm"]
@@ -4288,6 +4298,10 @@
     "source": "apache",
     "extensions": ["hdf"]
   },
+  "application/x-httpd-php": {
+    "compressible": true,
+    "extensions": ["php"]
+  },
   "application/x-install-instructions": {
     "source": "apache",
     "extensions": ["install"]
@@ -6050,6 +6064,10 @@
     "source": "apache",
     "extensions": ["p","pas"]
   },
+  "text/x-processing": {
+    "compressible": true,
+    "extensions": ["pde"]
+  },
   "text/x-sass": {
     "extensions": ["sass"]
   },
diff --git a/node_modules/mime-db/package.json b/node_modules/mime-db/package.json
index 6e5d6f201..4f62b9a56 100644
--- a/node_modules/mime-db/package.json
+++ b/node_modules/mime-db/package.json
@@ -1,12 +1,12 @@
 {
   "_args": [
     [
-      "mime-db@~1.13.0",
-      "/Users/rebecca/code/npm/node_modules/form-data/node_modules/mime-types"
+      "mime-db@~1.15.0",
+      "/Users/rebecca/code/npm/node_modules/mime-types"
     ]
   ],
-  "_from": "mime-db@>=1.13.0 <1.14.0",
-  "_id": "mime-db@1.13.0",
+  "_from": "mime-db@>=1.15.0 <1.16.0",
+  "_id": "mime-db@1.15.0",
   "_inCache": true,
   "_location": "/mime-db",
   "_npmUser": {
@@ -17,20 +17,20 @@
   "_phantomChildren": {},
   "_requested": {
     "name": "mime-db",
-    "raw": "mime-db@~1.13.0",
-    "rawSpec": "~1.13.0",
+    "raw": "mime-db@~1.15.0",
+    "rawSpec": "~1.15.0",
     "scope": null,
-    "spec": ">=1.13.0 <1.14.0",
+    "spec": ">=1.15.0 <1.16.0",
     "type": "range"
   },
   "_requiredBy": [
-    "/form-data/mime-types"
+    "/mime-types"
   ],
-  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz",
-  "_shasum": "fd6808168fe30835e7ea2205fc981d3b633e4e34",
+  "_resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz",
+  "_shasum": "d219e6214bbcae23a6fa69c0868c4fadc1405e8a",
   "_shrinkwrap": null,
-  "_spec": "mime-db@~1.13.0",
-  "_where": "/Users/rebecca/code/npm/node_modules/form-data/node_modules/mime-types",
+  "_spec": "mime-db@~1.15.0",
+  "_where": "/Users/rebecca/code/npm/node_modules/mime-types",
   "bugs": {
     "url": "https://github.com/jshttp/mime-db/issues"
   },
@@ -53,20 +53,20 @@
   "dependencies": {},
   "description": "Media Type Database",
   "devDependencies": {
-    "bluebird": "2.9.27",
-    "co": "4.5.4",
+    "bluebird": "2.9.33",
+    "co": "4.6.0",
     "cogent": "1.0.1",
-    "csv-parse": "0.1.2",
+    "csv-parse": "0.1.3",
     "gnode": "0.1.1",
-    "istanbul": "0.3.14",
+    "istanbul": "0.3.17",
     "mocha": "1.21.5",
-    "raw-body": "2.1.0",
+    "raw-body": "2.1.2",
     "stream-to-array": "2"
   },
   "directories": {},
   "dist": {
-    "shasum": "fd6808168fe30835e7ea2205fc981d3b633e4e34",
-    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.13.0.tgz"
+    "shasum": "d219e6214bbcae23a6fa69c0868c4fadc1405e8a",
+    "tarball": "http://registry.npmjs.org/mime-db/-/mime-db-1.15.0.tgz"
   },
   "engines": {
     "node": ">= 0.6"
@@ -78,7 +78,7 @@
     "db.json",
     "index.js"
   ],
-  "gitHead": "cd78635e4f8baf85d91b4edcd071f77f94a08c53",
+  "gitHead": "96922b79fcaacf8c2a95ce3368739ec71c9471a2",
   "homepage": "https://github.com/jshttp/mime-db",
   "keywords": [
     "charset",
@@ -114,5 +114,5 @@
     "test-travis": "istanbul cover node_modules/mocha/bin/_mocha --report lcovonly -- --reporter spec --check-leaks test/",
     "update": "npm run fetch && npm run build"
   },
-  "version": "1.13.0"
+  "version": "1.15.0"
 }