Vincent Breitmoser 9ef2795fcd Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java		2015-03-21 15:57:35 +01:00
..
src/main	Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel	2015-03-21 15:57:35 +01:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Update patternview lib, remove workaround	2015-03-03 15:56:03 +01:00