diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-01 11:09:25 +0200 |
| commit | e10cbc54c606563b2d06f083bca17119ca585127 (patch) | |
| tree | 23c71e67b1c4a381997bdb75de476f05d7dcec5f /Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png | |
| parent | bef3e621118d0e4d8fadedf0c9d67b6a9ff41883 (diff) | |
| parent | acbf2a18617eea73924dd109e09189420d9876fe (diff) | |
| download | open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.gz open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.tar.bz2 open-keychain-e10cbc54c606563b2d06f083bca17119ca585127.zip | |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
Diffstat (limited to 'Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png')
| -rw-r--r-- | Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png | bin | 0 -> 21420 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png b/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png Binary files differnew file mode 100644 index 000000000..6c6038df0 --- /dev/null +++ b/Resources/graphics/originals/modernpgp-icons/signatures/signature-expired-cutout@512x.png |