Dominik Schürmann af5fc66229 Merge pull request #1317 from adithyaphilip/master ... Merge key from Keyserver with that from Keybase instead of replacing		2015-06-01 10:15:46 +02:00
..
compatibility
keyimport	Cleanup in HkpKeyserver	2015-04-20 13:53:00 +02:00
operations	prevent keybase key replacing keyserver key	2015-05-31 02:49:11 +05:30
pgp	only promote subkeys which are actually present	2015-05-30 14:08:49 +02:00
provider	rewrite PgpDecryptVerify input, introduce PgpDecryptVerifyInputParcel	2015-05-30 13:25:47 +02:00
remote	some decrypt/verify bug fixes	2015-05-30 13:52:56 +02:00
service	switch to native DialogFragment, fix some nullpointers	2015-05-31 19:45:25 +02:00
ui	switch to native DialogFragment, fix some nullpointers	2015-05-31 19:45:25 +02:00
util	fixed sync on key import, 'me' linked contact crash	2015-05-08 19:05:21 +05:30
Constants.java	File extensions into Constants	2015-03-17 13:22:13 +01:00
KeychainApplication.java	revert unneeded changes for old temp Bluetooth share file	2015-05-04 17:15:10 -04:00