| 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/gamma | |
| 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/gamma/properties/gamma.properties.json | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ -159,33 +159,33 @@ "Clipperz/PM/UI/Web/Components/AccountPanel.js", "Clipperz/PM/UI/Web/Components/DataPanel.js", "Clipperz/PM/UI/Web/Components/ToolsPanel.js", "Clipperz/PM/UI/Web/Components/RulerComponent.js", "Clipperz/PM/UI/Web/Components/CardDialogComponent.js", "Clipperz/PM/UI/Web/Components/CardDialogRecordFieldComponent.js", "Clipperz/PM/UI/Web/Components/CardDialogRecordDirectLoginComponent.js", "Clipperz/PM/UI/Web/Components/DirectLoginEditingComponent.js", "Clipperz/PM/UI/Web/Components/DirectLoginEditingBindingComponent.js", "Clipperz/PM/UI/Web/Components/DirectLoginEditingFormValueComponent.js", "Clipperz/PM/UI/Web/Components/BookmarkletComponent.js", "Clipperz/PM/UI/Web/Components/UnlockPasswordComponent.js", "Clipperz/PM/UI/Web/Components/NewUserCreationComponent.js", "Clipperz/PM/UI/Web/Components/PasswordTooltip.js", "Clipperz/PM/UI/Web/Controllers/MainController.js", "Clipperz/PM/UI/Web/Controllers/LoginController.js", "Clipperz/PM/UI/Web/Controllers/AppController.js", "Clipperz/PM/UI/Web/Controllers/FilterController.js", "Clipperz/PM/UI/Web/Controllers/GridController.js", "Clipperz/PM/UI/Web/Controllers/CardsController.js", "Clipperz/PM/UI/Web/Controllers/DirectLoginsController.js", "Clipperz/PM/UI/Web/Controllers/CardDialogController.js", "Clipperz/PM/UI/Web/Controllers/DirectLoginWizardController.js", "Clipperz/PM/UI/Web/Controllers/NewUserWizardController.js", "main.js" ], "css": [ "web.css" ] -}
\ No newline at end of file +} |