Merge branch 'master' of github.com:open-keychain/open-keychain

2015-07-06 11:27:57 +02:00
parent baf059843e 7648602fc8
commit 801566bdb1
75 changed files with 2270 additions and 430 deletions
--- a/OpenKeychain/build.gradle
+++ b/OpenKeychain/build.gradle
@@ -55,6 +55,7 @@ dependencies {
    compile 'com.mikepenz.iconics:meteocons-typeface:1.1.1@aar'
    compile 'com.mikepenz.iconics:community-material-typeface:1.0.0@aar'
    compile 'com.nispok:snackbar:2.10.8'
+    compile 'com.squareup.okhttp:okhttp:2.4.0'

    // libs as submodules
    compile project(':extern:openpgp-api-lib:openpgp-api')