mirror of
https://github.com/moparisthebest/open-keychain
synced 2025-01-05 18:48:05 -05:00
e10cbc54c6
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 |
||
---|---|---|
.. | ||
assets | ||
java | ||
res | ||
AndroidManifest.xml |