Vincent Breitmoser f9ef1160ca Merge branch 'development' into linked-identities ...

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

2015-03-24 15:29:58 +01:00

..

src/test

Merge branch 'development' into linked-identities

2015-03-24 15:29:58 +01:00

build.gradle

Use fixed version of com.squareup:fest-android, enable offline builds

2015-03-15 14:57:37 +01:00