mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-04 16:25:05 -05:00
e457d4c909
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/res/values-de/strings.xml |
||
---|---|---|
.. | ||
src/main | ||
.gitignore | ||
build.gradle |