Merge remote-tracking branch 'upstream/master' into multiple-input-files

This commit is contained in:
j433866 2019-07-03 13:20:21 +01:00
commit a7eefa88fa
41 changed files with 2971 additions and 273 deletions

View file

@ -10,7 +10,7 @@ import "./stylesheets/index.js";
// Libs
import "arrive";
import "snackbarjs";
import "bootstrap-material-design";
import "bootstrap-material-design/js/index";
import "bootstrap-colorpicker";
import moment from "moment-timezone";
import * as CanvasComponents from "../core/lib/CanvasComponents";