Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java

2014-07-16 18:49:16 +02:00

..

src

Merge remote-tracking branch 'upstream/master'

2014-07-16 18:49:16 +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