mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-23 09:12:16 -05:00
e8780b4410
Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java |
||
---|---|---|
.. | ||
android-lockpattern@b9fcb13dca | ||
html-textview@eedaa334e7 | ||
KeybaseLib@2b26d163df | ||
minidns@f3a19080f1 | ||
openkeychain-api-lib@88c0047932 | ||
openpgp-api-lib@edcc61970f | ||
safeslinger-exchange@96f7c89356 | ||
spongycastle@26c232f31b | ||
StickyListHeaders@62cc58c12d | ||
SuperToasts@77042d633f | ||
TokenAutoComplete@ca46b4261c | ||
zxing-android-integration@e2d0064bd3 | ||
zxing-qr-code@8fd0657d33 |