Merge branch 'master' into doc-version-sha

OpenGeoscience · Jul 12, 2018 · 1af4221 · 1af4221
2 parents ca4878c + 86dd841
commit 1af4221
Show file tree

Hide file tree

Showing 11 changed files with 1,408 additions and 1,379 deletions.
diff --git a/karma-base.js b/karma-base.js
@@ -341,6 +341,11 @@ module.exports = function (config) {
     frameworks: [
       'jasmine', 'sinon'
     ],
+    client: {
+      jasmine: {
+        random: false
+      }
+    },
     webpack: {
       cache: true,
       devtool: 'inline-source-map',