Merge branch 'master' into artemisbot-module-charts

This commit is contained in:
n1474335 committed 2019-03-31 21:21:08 +01:00
commit f0b48acaf9
10 files changed
+2078 -2907

No files matched your search

-1
View File
@@ -6,7 +6,6 @@
* @license Apache-2.0
*/
import "babel-polyfill";
import Chef from "./Chef";
import OperationConfig from "./config/OperationConfig.json";
import OpModules from "./config/modules/OpModules";
-1
View File
@@ -5,7 +5,6 @@
* @copyright Crown Copyright 2017
* @license Apache-2.0
*/
import "babel-polyfill";
// Define global environment functions
global.ENVIRONMENT_IS_WORKER = function() {
+1 -1
View File
@@ -95,7 +95,7 @@ class SeasonalWaiter {
}
if (!this.app.options.clippy) {
this.clippyTimeouts.forEach(t => clearTimeout(t));
if (this.clippyTimeouts) this.clippyTimeouts.forEach(t => clearTimeout(t));
return;
}
-1
View File
@@ -8,7 +8,6 @@
import "./stylesheets/index.js";
// Libs
import "babel-polyfill";
import "arrive";
import "snackbarjs";
import "bootstrap-material-design";