Merge branch 'develop'

ActiDoo · Jan 11, 2020 · 4f62e9b · 4f62e9b
2 parents 15d3df0 + 1e293f9
commit 4f62e9b
Show file tree

Hide file tree

Showing 9 changed files with 90 additions and 53 deletions.
diff --git a/gengine/app/jsscripts/build/asset-manifest.json b/gengine/app/jsscripts/build/asset-manifest.json
@@ -1,8 +1,8 @@
 {
   "main.css": "static/css/main.a5a0edab.css",
   "main.css.map": "static/css/main.a5a0edab.css.map",
-  "main.js": "static/js/main.81304847.js",
-  "main.js.map": "static/js/main.81304847.js.map",
+  "main.js": "static/js/main.4589375e.js",
+  "main.js.map": "static/js/main.4589375e.js.map",
   "static/js/0.f7d7d8b6.chunk.js": "static/js/0.f7d7d8b6.chunk.js",
   "static/js/0.f7d7d8b6.chunk.js.map": "static/js/0.f7d7d8b6.chunk.js.map"
 }
diff --git a/gengine/app/jsscripts/build/index.html b/gengine/app/jsscripts/build/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>React App</title><link href="/static/css/main.a5a0edab.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.81304847.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>React App</title><link href="/static/css/main.a5a0edab.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script type="text/javascript" src="/static/js/main.4589375e.js"></script></body></html>
diff --git a/gengine/app/jsscripts/build/service-worker.js b/gengine/app/jsscripts/build/service-worker.js
diff --git a/gengine/app/jsscripts/build/static/js/main.4589375e.js b/gengine/app/jsscripts/build/static/js/main.4589375e.js
diff --git a/...ipts/build/static/js/main.81304847.js.map → ...ipts/build/static/js/main.4589375e.js.map b/...ipts/build/static/js/main.81304847.js.map → ...ipts/build/static/js/main.4589375e.js.map
diff --git a/gengine/app/jsscripts/build/static/js/main.81304847.js b/gengine/app/jsscripts/build/static/js/main.81304847.js
diff --git a/gengine/app/jsscripts/package.json b/gengine/app/jsscripts/package.json
@@ -6,7 +6,7 @@
     "font-awesome": "^4.7.0",
     "input-moment": "^0.3.4",
     "intl": "^1.2.5",
-    "lodash": "^4.17.4",
+    "lodash": "^4.17.13",
     "mobile-detect": "^1.3.6",
     "moment": "^2.18.1",
     "react": "^15.5.4",