Merge tag '2020.01-07' into develop

2020.01-07 2020.01-07

.ddev/.gitignore

@@ -1,24 +0,0 @@
-#ddev-generated: Automatically generated ddev .gitignore.
-# You can remove the above line if you want to edit and maintain this file yourself.
-
-/commands/*/*.example
-/commands/*/README.txt
-/commands/host/launch
-/commands/db/mysql
-/homeadditions/*.example
-/homeadditions/README.txt
-/.gitignore
-/import.yaml
-/docker-compose.yaml
-/db_snapshots
-/sequelpro.spf
-/import-db
-/.bgsync*
-/config.*.y*ml
-/.webimageBuild
-/.dbimageBuild
-/.bgsyncimageBuild
-/.sshimageBuild
-/.webimageExtra
-/.dbimageExtra
-/*-build/Dockerfile.example

.nvmrc

@@ -1 +0,0 @@
-10

composer.lock

@@ -1263,16 +1263,16 @@
         },
         {
             "name": "kigkonsult/icalcreator",
-            "version": "v2.29.15",
+            "version": "v2.29.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/iCalcreator/iCalcreator.git",
-                "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e"
+                "reference": "3687fe06deab48e889eae8afd1d31d201eb2b8a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/f66748df0858f5a9fecbecee41b81a3a63f12f4e",
-                "reference": "f66748df0858f5a9fecbecee41b81a3a63f12f4e",
+                "url": "https://api.github.com/repos/iCalcreator/iCalcreator/zipball/3687fe06deab48e889eae8afd1d31d201eb2b8a0",
+                "reference": "3687fe06deab48e889eae8afd1d31d201eb2b8a0",
                 "shasum": ""
             },
             "require": {

package.json

@@ -6,7 +6,7 @@
   "license": "WTFPL",
   "repository": "https://gitlab.com/dreipunktnull/ep_theme.git",
   "scripts": {
-    "dev": "./node_modules/.bin/encore dev --watch",
+    "dev": "./node_modules/.bin/encore dev --watch --watch-poll",
     "build": "./node_modules/.bin/encore production"
   },
   "dependencies": {