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

This commit is contained in:
th33xitus
2021-01-25 19:01:55 +01:00
9 changed files with 11 additions and 17 deletions

View File

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