password-manager-mirror

mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-31 03:17:35 +01:00

Files

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

Clipperz

Merge remote-tracking branch 'clipperz/export' into import

2015-06-27 18:33:01 +02:00

FileSaver

Merged Import and Export branches, implemented Giulio's remarks on Import feature

2015-05-21 14:34:49 +02:00

MochiKit

Removed clipperz copyright/license note

2015-03-22 21:10:48 +01:00

Modernizr

Merged Import and Export branches, implemented Giulio's remarks on Import feature