Dominik Schürmann b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master ...

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

2014-07-18 09:49:20 +02:00

..

src/main

Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master

2014-07-18 09:49:20 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

travis: get rid of lint

2014-07-11 16:39:31 +02:00