From 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 Mon Sep 17 00:00:00 2001
From: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Date: Sat, 17 Mar 2012 21:28:40 +0000
Subject: Merge branch 'buildFix' of https://github.com/jokajak/password-manager

Conflicts:
	frontend/gamma/properties/gamma.properties.json
---
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
@@ -1,8 +1,8 @@
 {
 	"request.path": "clipperz.py",
-	"should.pay.toll": "false"
+	"should.pay.toll": "false",
 
 	"development.settings": {
 		"url": "http://localhost/python/clipperz"
 	}
-}
\ 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
@@ -183,5 +183,8 @@
 		"clipperz/clipperz.css",
 		"clipperz/compact.css",
 		"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
@@ -188,4 +188,4 @@
 	"css": [
 		"web.css"
 	]
-}
\ No newline at end of file
+}
--
cgit v0.9.0.2