Vincent Breitmoser 2b5023a75d Merge branch 'development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

2015-03-08 01:49:22 +01:00

..

src/main

Merge branch 'development' into linked-identities

2015-03-08 01:49:22 +01:00

.gitignore

…

build.gradle

Update patternview lib, remove workaround

2015-03-03 15:56:03 +01:00