Giulio Cesare Solaroli 748c654bf5 Merge branch 'master' of https://github.com/dario-chiappetta/password-manager ... Conflicts: frontend/delta/css/clipperz.css.map		2015-11-26 17:09:55 +01:00
..
clipperz.css	Merge branch 'master' of https://github.com/dario-chiappetta/password-manager	2015-11-26 17:09:55 +01:00
clipperz.css.map	Improved IE11 compatibility and fixed attachments on brandNew cards	2015-11-26 16:02:44 +01:00