| 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 | |
| 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
| -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 @@ -154,34 +154,37 @@ "Clipperz/PM/BookmarkletProcessor.js", "Clipperz/PM/DataModel/User.js", "Clipperz/PM/DataModel/UserPreferences.js", "Clipperz/PM/DataModel/Header.js", "Clipperz/PM/DataModel/Statistics.js", "Clipperz/PM/DataModel/Record.js", "Clipperz/PM/DataModel/RecordField.js", "Clipperz/PM/DataModel/RecordVersion.js", "Clipperz/PM/DataModel/DirectLogin.js", "Clipperz/PM/DataModel/DirectLoginReference.js", "Clipperz/PM/DataModel/DirectLoginInput.js", "Clipperz/PM/DataModel/DirectLoginBinding.js", "Clipperz/PM/DataModel/OneTimePasswordManager.js", "Clipperz/PM/DataModel/OneTimePassword.js", "Clipperz/YUI/IBLayoutManager.js", "Clipperz/YUI/IBLayoutRegion.js", "Clipperz/YUI/Drawer.js", "Clipperz/YUI/Collapser.js", "Clipperz/YUI/MessageBox.js", "Clipperz/YUI/DomHelper.js", "Clipperz/PM/Main.js" ], "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" + } |