Vincent Breitmoser a9c3d6b507 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test ...

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell

2014-07-09 16:39:26 +02:00

..

compatibility

Update license header for 2014

2014-04-13 17:27:22 +02:00

helper

Magic to find possible mails and names of device owner

2014-06-28 00:05:12 +02:00

keyimport

Move sks-keyservers.net CA into assets folder

2014-06-25 00:37:01 +02:00

pgp

support changing primary user id in SaveKeyringParcel

2014-07-02 16:02:56 +02:00

provider

don't use zero plural string for english

2014-07-02 14:51:11 +02:00

remote

Remove old edit button, rename activities

2014-07-03 16:21:16 +02:00

service

Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test

2014-07-09 16:39:26 +02:00

ui

Prefer composition to inheritance is the mantra these das

2014-07-06 15:23:39 +01:00

util

Moved Keybase stuff into KeybaseLib submodule

2014-06-20 09:31:34 -07:00

Constants.java

Move sks-keyservers.net CA into assets folder

2014-06-25 00:37:01 +02:00

KeychainApplication.java

Move sks-keyservers.net CA into assets folder

2014-06-25 00:37:01 +02:00