| author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 14:40:38 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 14:40:38 (UTC) |
| commit | e61e994abb9738d98447b203b9908793da6f560a (patch) (side-by-side diff) | |
| tree | c12d695420bb6281708b367d52970eac5615ef1c /frontend/beta/images/favicon.ico | |
| parent | 65a7a7be3feb846d6b1062a0b858a7660e8f99fa (diff) | |
| parent | 24f7bfcbe317fe9f0d7de7cef3cb3b3b341c95a5 (diff) | |
| download | clipperz-e61e994abb9738d98447b203b9908793da6f560a.zip clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.gz clipperz-e61e994abb9738d98447b203b9908793da6f560a.tar.bz2 | |
Merge branch 'buildScript' of https://github.com/jokajak/password-manager
Conflicts:
scripts/builder/repository.py
Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
Diffstat (limited to 'frontend/beta/images/favicon.ico') (more/less context) (ignore whitespace changes)
0 files changed, 0 insertions, 0 deletions