Merge branch '3.99' into 4.0

2021-10-02 09:52:43 -07:00
parent 35064cf60e 7f0087b805
commit 9c03d4d3e9
9 changed files with 223 additions and 16 deletions
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
    "grunt-contrib-concat": "^1.0.1",
    "grunt-css-url-embed": "^1.11.1",
    "grunt-sass": "^3.0.2",
-    "jasmine": "github:jasmine/jasmine-npm#main",
+    "jasmine": "^3.4.0",
    "jasmine-browser-runner": "github:jasmine/jasmine-browser#main",
    "jsdom": "^15.0.0",
    "load-grunt-tasks": "^4.0.0",