diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 17:32:21 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 17:32:21 +0200 |
commit | 1463bae1b43ffbac6672a19cc87ac1dbcfca9530 (patch) | |
tree | e7ec4137fc2c3333801ff430ea8439b0acffad04 /Resources/screenshots/device-2014-05-14-222753.png | |
parent | ee02e110e7f1a90d2a91c4fc09834b8c073cbba7 (diff) | |
download | open-keychain-1463bae1b43ffbac6672a19cc87ac1dbcfca9530.tar.gz open-keychain-1463bae1b43ffbac6672a19cc87ac1dbcfca9530.tar.bz2 open-keychain-1463bae1b43ffbac6672a19cc87ac1dbcfca9530.zip |
fix merge problems (derp)
Diffstat (limited to 'Resources/screenshots/device-2014-05-14-222753.png')
0 files changed, 0 insertions, 0 deletions