Merge branch 'master' into v5

# Conflicts: # dist/ref-parser.js # dist/ref-parser.min.js # package.json
APIDevTools · Apr 9, 2018 · 9cc4c18 · 9cc4c18
2 parents 41fb74e + 1719f7f
commit 9cc4c18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/dist/ref-parser.js b/dist/ref-parser.js
diff --git a/dist/ref-parser.min.js b/dist/ref-parser.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "json-schema-ref-parser",
-  "version": "5.0.2",
+  "version": "5.0.3",
   "description": "Parse, Resolve, and Dereference JSON Schema $ref pointers",
   "keywords": [
     "json",
@@ -62,6 +62,7 @@
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-coverage": "^1.1.1",
+    "karma-edge-launcher": "^0.4.2",
     "karma-firefox-launcher": "^1.1.0",
     "karma-ie-launcher": "^1.0.0",
     "karma-mocha": "^1.3.0",
@@ -77,7 +78,6 @@
     "call-me-maybe": "^1.0.1",
     "debug": "^3.1.0",
     "js-yaml": "^3.11.0",
-    "karma-edge-launcher": "^0.4.2",
     "ono": "^4.0.3"
   }
 }