Vincent Breitmoser 7b3bc4ca98 Merge branch 'development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java

2015-03-05 12:10:51 +01:00

..

src/main

Merge branch 'development' into linked-identities

2015-03-05 12:10:51 +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