diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
| commit | baea31847022ce88906a0190638ddffed82c8a7c (patch) | |
| tree | cdd080f224a82a377295a02f64f62fb7534012cb /settings.gradle | |
| parent | c8790f404aaf76db967a16c8fea79eb6f90c8bce (diff) | |
| parent | 98ba424576946d2f5ef529c5506113b71b0266c4 (diff) | |
| download | open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.gz open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.bz2 open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.zip | |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'settings.gradle')
| -rw-r--r-- | settings.gradle | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/settings.gradle b/settings.gradle index 1b9038344..baf7e0e64 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,4 +8,3 @@ include ':extern:spongycastle:prov' include ':extern:minidns' include ':extern:KeybaseLib:Lib' include ':extern:safeslinger-exchange' -include ':OpenKeychain-Test' |