diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-15 14:00:17 +0200 |
| commit | e457d4c9097cb3f2e1c6305609cfacff1c5c38c2 (patch) | |
| tree | 9d6410b554b68aca6aa49539e045e9db5d703cbf /extern | |
| parent | 9a3a032d99064cd16ca065a214d8f7fd09d54088 (diff) | |
| parent | 40751bceb586d12da671966c1ad5661223819c5b (diff) | |
| download | open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.gz open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.tar.bz2 open-keychain-e457d4c9097cb3f2e1c6305609cfacff1c5c38c2.zip | |
Merge remote-tracking branch 'origin/master'
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
OpenKeychain/src/main/res/values-de/strings.xml
Diffstat (limited to 'extern')
| m--------- | extern/openkeychain-api-lib | 0 | ||||
| m--------- | extern/safeslinger-exchange | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/extern/openkeychain-api-lib b/extern/openkeychain-api-lib -Subproject 848dc453302c5f54464243a9f208912919927f0 +Subproject 57e58e7f7f51c4eecd7ee4b0f22c856485a243b diff --git a/extern/safeslinger-exchange b/extern/safeslinger-exchange -Subproject 4f07070ae6bcdc510351b5fd23e1d04ba9d612f +Subproject eb770ac3cb4fe49de0a87bda13f3a29b26e2901 |