Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Conflicts:
	frontend/gamma/properties/gamma.properties.json

3 files changed, 7 insertions, 4 deletions

diff --git a/backend/python/properties/python.properties.json b/backend/python/properties/python.properties.json
index 128c98e..8dd872f 100644
--- a/backend/python/properties/python.properties.json
+++ b/backend/python/properties/python.properties.json
@@ -2,3 +2,3 @@
         "request.path": "clipperz.py",
-        "should.pay.toll": "false"
+        "should.pay.toll": "false",
 
@@ -7,2 +7,2 @@
         }
-}
\ No newline at end of file
+}
diff --git a/frontend/beta/properties/beta.properties.json b/frontend/beta/properties/beta.properties.json
index 476becd..810215b 100644
--- a/frontend/beta/properties/beta.properties.json
+++ b/frontend/beta/properties/beta.properties.json
@@ -185,3 +185,6 @@
                 "clipperz/ytheme-clipperz.css"
-        ]
+        ],
+
+        "html.template": "index_template.html"
+
 }
diff --git a/frontend/gamma/properties/gamma.properties.json b/frontend/gamma/properties/gamma.properties.json
index 0a513e8..c847812 100644
--- a/frontend/gamma/properties/gamma.properties.json
+++ b/frontend/gamma/properties/gamma.properties.json
@@ -190,2 +190,2 @@
         ]
-}
\ No newline at end of file
+}