mirror of
https://github.com/moparisthebest/open-keychain
synced 2025-01-06 19:18:02 -05:00
5e4239a7b9
Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/res/values/strings.xml |
||
---|---|---|
.. | ||
src/main | ||
.gitignore | ||
build.gradle |