diff options
| author | Christian S <christian@pix-art.de> | 2016-01-17 11:46:10 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-01-17 11:46:10 +0100 |
| commit | ae60bc265191eeb31bd5e96b030059ec4bd84027 (patch) | |
| tree | 50b424b30a60c7ccee8cdf68398c77630da45d59 /build.gradle | |
| parent | ebfaa84167614c7c23b0593950704a343571ee4a (diff) | |
| parent | ba143a27309657ce6694b0acaf2fb34069b79313 (diff) | |
Merge branch 'siacs/master' into development
Diffstat (limited to 'build.gradle')
| -rw-r--r-- | build.gradle | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build.gradle b/build.gradle index df3b624cc..6218c768f 100644 --- a/build.gradle +++ b/build.gradle @@ -29,8 +29,8 @@ repositories { dependencies { compile project(':libs:MemorizingTrustManager') + compile 'org.sufficientlysecure:openpgp-api:10.0' compile 'com.soundcloud.android:android-crop:1.0.1@aar' - compile 'org.sufficientlysecure:openpgp-api:9.0' compile 'com.android.support:support-v13:23.0.1' compile 'org.bouncycastle:bcprov-jdk15on:1.52' compile 'org.bouncycastle:bcmail-jdk15on:1.52' |