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

Conflicts: frontend/gamma/properties/gamma.properties.json
2012-03-17 21:28:40 +00:00 · 2012-03-17 21:28:40 +00:00 · 12cd9d47a6
commit 12cd9d47a6
parent 25029b9437 d791e1df1f
3 changed files with 7 additions and 4 deletions
--- a/backend/python/properties/python.properties.json
+++ b/backend/python/properties/python.properties.json
@ -1,8 +1,8 @@
 {
 	"request.path": "clipperz.py",
-	"should.pay.toll": "false"
+	"should.pay.toll": "false",

 	"development.settings": {
 		"url": "http://localhost/python/clipperz"
 	}
-}
+}
--- a/frontend/beta/properties/beta.properties.json
+++ b/frontend/beta/properties/beta.properties.json
@ -183,5 +183,8 @@
 		"clipperz/clipperz.css",
 		"clipperz/compact.css",
 		"clipperz/ytheme-clipperz.css"
-	]
+	],
+
+	"html.template": "index_template.html"
+
 }
--- a/frontend/gamma/properties/gamma.properties.json
+++ b/frontend/gamma/properties/gamma.properties.json
@ -188,4 +188,4 @@
 	"css": [
 		"web.css"
 	]
-}
+}