Merge remote-tracking branch 'origin/master' into kiauh-rework

resources/fluidd_nginx.cfg

@@ -56,4 +56,4 @@ server {
     location /webcam/ {
         proxy_pass http://mjpgstreamer/;
     }
-}
+}

resources/mainsail_nginx.cfg

@@ -56,4 +56,4 @@ server {
     location /webcam/ {
         proxy_pass http://mjpgstreamer/;
     }
-}
+}

resources/upstreams.conf

@@ -10,4 +10,4 @@ upstream mjpgstreamer {
     #edit your webcam port here
     ip_hash;
     server 127.0.0.1:8080;
-}
+}