75d5724c8a
Conflicts: frontend/delta/css/clipperz.css frontend/delta/js/Clipperz/PM/DataModel/Record.js frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/DeleteAccount.js frontend/delta/js/Clipperz/PM/UI/Components/Panels/ExtraFeaturesPanel.js frontend/delta/js/Clipperz/PM/UI/MainController.js frontend/delta/properties/delta.properties.json frontend/delta/scss/style/settingsPanel.scss |
||
---|---|---|
.. | ||
DataModel | ||
Proxy | ||
Strings | ||
UI | ||
BookmarkletProcessor.js | ||
Connection.js | ||
Crypto.js | ||
Date.js | ||
PIN.js | ||
Proxy.js | ||
Strings.js | ||
Toll.js |