password-manager/frontend/delta/js/Clipperz/PM
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
..
DataModel Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
Proxy Many small overall UI improvements 2015-03-10 22:59:24 +01:00
Strings updated copyright statements 2015-03-09 15:45:35 +01:00
UI Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
BookmarkletProcessor.js updated copyright statements 2015-03-09 15:45:35 +01:00
Connection.js updated copyright statements 2015-03-09 15:45:35 +01:00
Crypto.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
PIN.js updated copyright statements 2015-03-09 15:45:35 +01:00
Proxy.js Many small overall UI improvements 2015-03-10 22:59:24 +01:00
Strings.js updated copyright statements 2015-03-09 15:45:35 +01:00
Toll.js updated copyright statements 2015-03-09 15:45:35 +01:00