mirror of
http://git.whoc.org.uk/git/password-manager.git
synced 2025-01-10 11:50:03 +01:00
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 |
||
---|---|---|
.. | ||
creditsAndCopyrights.txt | ||
delta.properties.json | ||
manifest.appcache |