summaryrefslogtreecommitdiff
path: root/frontend
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 21:28:40 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 21:28:40 (UTC)
commit12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (unidiff)
tree42fe98603849248c0d3943fd1d79135a734811c9 /frontend
parent25029b943781850c76fbf43827af0204f35a98bf (diff)
parentd791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff)
downloadclipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.zip
clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.gz
clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.bz2
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts: frontend/gamma/properties/gamma.properties.json
Diffstat (limited to 'frontend') (more/less context) (show whitespace changes)
-rw-r--r--frontend/beta/properties/beta.properties.json5
-rw-r--r--frontend/gamma/properties/gamma.properties.json0
2 files changed, 4 insertions, 1 deletions
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 @@
183 "clipperz/clipperz.css", 183 "clipperz/clipperz.css",
184 "clipperz/compact.css", 184 "clipperz/compact.css",
185 "clipperz/ytheme-clipperz.css" 185 "clipperz/ytheme-clipperz.css"
186 ] 186 ],
187
188 "html.template": "index_template.html"
189
187} 190}
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