merge master into develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtipi",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "A homeserver for everyone",
   "scripts": {
     "copy:migrations": "mkdir -p dist/migrations && cp -r ./src/server/migrations dist",