Merge remote-tracking branch 'upstream/main' into ipv6

.prettierignore

@@ -23,6 +23,10 @@
 # Web templates (for now)
 web/templates/
 
+# Hestia Nginx.conf
+/scr/deb/nginx/nginx.conf
+/scr/rpm/nginx/nginx.conf
+
 # Email templates
 /install/common/templates/email/