author | Giulio 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) |
commit | 12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (side-by-side diff) | |
tree | 42fe98603849248c0d3943fd1d79135a734811c9 /frontend/beta/properties/beta.properties.json | |
parent | 25029b943781850c76fbf43827af0204f35a98bf (diff) | |
parent | d791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff) | |
download | clipperz-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/beta/properties/beta.properties.json') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/beta/properties/beta.properties.json | 5 |
1 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 @@ -178,10 +178,13 @@ "css": [ "yui-extensions/reset-min.css", "yui-extensions/core.css", "yui-extensions/basic-dialog.css", "yui-extensions/button.css", "clipperz/clipperz.css", "clipperz/compact.css", "clipperz/ytheme-clipperz.css" - ] + ], + + "html.template": "index_template.html" + } |