summaryrefslogtreecommitdiff
path: root/bootstrap/img
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:50:42 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-05-16 16:50:42 -0300
commit2d5facf273018bdef3fe442a64346b24cff631dc (patch)
tree2e9c31a81657ea531ef99433a09a6534959f18d1 /bootstrap/img
parentb19b9318d0fe0de9444dda6856a17384b8b9450d (diff)
parent30328dcdebd1bdca9385b8f4e17ace0c0500efdc (diff)
downloadkeyringer-2d5facf273018bdef3fe442a64346b24cff631dc.tar.gz
keyringer-2d5facf273018bdef3fe442a64346b24cff631dc.tar.bz2
Merge branch 'master' into develop
Diffstat (limited to 'bootstrap/img')
0 files changed, 0 insertions, 0 deletions