summaryrefslogtreecommitdiff
path: root/frontend/beta/js/Bookmarklet.js
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 21:28:40 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-03-17 21:28:40 (UTC)
commit12cd9d47a6e1c8f8dad28d53a261412218ace6d3 (patch) (side-by-side diff)
tree42fe98603849248c0d3943fd1d79135a734811c9 /frontend/beta/js/Bookmarklet.js
parent25029b943781850c76fbf43827af0204f35a98bf (diff)
parentd791e1df1f701c1fe523f05a8521c4ad1cf032b5 (diff)
downloadclipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.zip
clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.gz
clipperz-12cd9d47a6e1c8f8dad28d53a261412218ace6d3.tar.bz2
Merge branch 'buildFix' of https://github.com/jokajak/password-manager
Conflicts: frontend/gamma/properties/gamma.properties.json
Diffstat (limited to 'frontend/beta/js/Bookmarklet.js') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions