password-manager/frontend/delta/js/Clipperz
Giulio Cesare Solaroli 75d5724c8a Merge remote-tracking branch 'clipperz/export' into import
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
2015-06-27 18:33:01 +02:00
..
Crypto updated copyright statements 2015-03-09 15:45:35 +01:00
PM Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
YUI updated copyright statements 2015-03-09 15:45:35 +01:00
Async.js updated copyright statements 2015-03-09 15:45:35 +01:00
Base.js updated copyright statements 2015-03-09 15:45:35 +01:00
ByteArray.js updated copyright statements 2015-03-09 15:45:35 +01:00
CSVProcessor.js updated copyright statements 2015-03-09 15:45:35 +01:00
Date.js updated copyright statements 2015-03-09 15:45:35 +01:00
DOM.js updated copyright statements 2015-03-09 15:45:35 +01:00
KeePassExportProcessor.js updated copyright statements 2015-03-09 15:45:35 +01:00
KeyValueObjectStore.js updated copyright statements 2015-03-09 15:45:35 +01:00
Logging.js updated copyright statements 2015-03-09 15:45:35 +01:00
Set.js updated copyright statements 2015-03-09 15:45:35 +01:00
Signal.js updated copyright statements 2015-03-09 15:45:35 +01:00
Style.js updated copyright statements 2015-03-09 15:45:35 +01:00
Visual.js updated copyright statements 2015-03-09 15:45:35 +01:00