Tim Bray 734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java

2014-11-21 19:45:35 -08:00

..

src/main

Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs

2014-11-21 19:45:35 -08:00

.gitignore

…

build.gradle

Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate

2014-09-24 02:01:53 +02:00