clipperz/password-manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
75d5724c8a
password-manager/frontend/delta
History
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
..
css Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
fonts Merged Import and Export branches, implemented Giulio's remarks on Import feature 2015-05-21 14:34:49 +02:00
html Merged Import and Export branches, implemented Giulio's remarks on Import feature 2015-05-21 14:34:49 +02:00
js Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
properties Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
scss Merge remote-tracking branch 'clipperz/export' into import 2015-06-27 18:33:01 +02:00
tests Enabled one more (now green) test 2015-03-16 17:44:32 +01:00