mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-25 16:38:50 -05:00
8132b9ac74
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java |
||
---|---|---|
.. | ||
html-textview@eedaa334e7 | ||
KeybaseLib@e214906a52 | ||
minidns@dcf62a8ac5 | ||
openkeychain-api-lib@48941ca6ec | ||
openpgp-api-lib@869ab96e6d | ||
spongycastle@41ef8b1f53 | ||
StickyListHeaders@706c0e4472 | ||
SuperToasts@8578cfe691 | ||
zxing-android-integration@1d78784566 | ||
zxing-qr-code@9ef2f3b66e |