merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 0 insertions, 15 deletions

diff --git a/opendc-web/opendc-web-ui/nginx.conf b/opendc-web/opendc-web-ui/nginx.conf
deleted file mode 100644
index 1b4e3a73..00000000
--- a/opendc-web/opendc-web-ui/nginx.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-server {
-    listen       80;
-    server_name  opendc.org;
-
-    location / {
-        root   /usr/share/nginx/html;
-        index  index.html index.htm;
-        try_files $uri $uri/ /index.html;
-    }
-
-    error_page   500 502 503 504  /50x.html;
-    location = /50x.html {
-        root   /usr/share/nginx/html;
-    }
-}