diff options
author | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
---|---|---|
committer | mar-v-in <github@rvin.mooo.com> | 2014-07-01 00:15:30 +0200 |
commit | d1d414c006aa6b7b80b25b34f0c75a92a9603a85 (patch) | |
tree | 6375bd8a5436c866824190318d10d183d8548ab6 /OpenKeychain/build.gradle | |
parent | 38823b73a31ae0fb82d7e385c141f1170127c4dd (diff) | |
parent | a9010045889d307ede37d154b0a2fece566c1845 (diff) | |
download | open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.gz open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.tar.bz2 open-keychain-d1d414c006aa6b7b80b25b34f0c75a92a9603a85.zip |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
Diffstat (limited to 'OpenKeychain/build.gradle')
-rw-r--r-- | OpenKeychain/build.gradle | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/build.gradle b/OpenKeychain/build.gradle index fd0c4c6ba..f419141b4 100644 --- a/OpenKeychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -10,7 +10,6 @@ dependencies { compile project(':extern:openkeychain-api-lib') compile project(':extern:html-textview') compile project(':extern:StickyListHeaders:library') - compile project(':extern:AndroidBootstrap:AndroidBootstrap') compile project(':extern:zxing-qr-code') compile project(':extern:zxing-android-integration') compile project(':extern:spongycastle:core') |