Giulio Cesare Solaroli 5fdf12bb5e Merge branch 'master' of https://github.com/dario-chiappetta/password-manager ... Conflicts: frontend/delta/css/clipperz.css.map		2015-11-25 22:46:01 +01:00
..
clipperz.css	Merge branch 'master' of https://github.com/dario-chiappetta/password-manager	2015-11-25 22:46:01 +01:00
clipperz.css.map	Tentative fix for SRP problem and improved Attachments UI in card View	2015-11-25 10:39:50 +01:00