cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-04-09 13:57:56 +02:00
parent d27925ad19 dcaac4f85f
commit a4b7daf266
236 changed files with 10295 additions and 8379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain-Test/build.gradle
View File

@@ -5,7 +5,7 @@ buildscript {
dependencies {
// NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information
classpath 'com.novoda:gradle-android-test-plugin:0.10.0'
classpath 'com.novoda:gradle-android-test-plugin:0.10.1'
}
}