mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-05 16:55:05 -05:00
377d0f09fa
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java |
||
---|---|---|
.. | ||
html-textview@eedaa334e7 | ||
KeybaseLib@e214906a52 | ||
minidns@dcf62a8ac5 | ||
openkeychain-api-lib@02cb8ad24b | ||
openpgp-api-lib@e515a49027 | ||
spongycastle@9e4fb80c4f | ||
StickyListHeaders@706c0e4472 | ||
SuperToasts@8578cfe691 | ||
zxing-android-integration@1d78784566 | ||
zxing-qr-code@9ef2f3b66e |