From 758bd68eee9c0ae1d3ad8dc50481c78557bd6228 Mon Sep 17 00:00:00 2001 From: Giulio Cesare Solaroli Date: Sat, 17 Mar 2012 21:30:29 +0000 Subject: Merge pull request #35 from gcsolaroli/master Merged pull request #33 --- 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