Merge branch 'master' into yubikey

2014-07-21 15:11:59 +02:00
parent 976b232946 f560bc9317
commit 2f5c73746d
17 changed files with 319 additions and 145 deletions
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'android'
-apply plugin: 'robolectric'

 dependencies {
    // NOTE: Always use fixed version codes not dynamic ones, e.g. 0.7.3 instead of 0.7.+, see README for more information