diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-09 13:57:56 +0200 |
| commit | a4b7daf266b037c6a39cef0586aadedf32861ad5 (patch) | |
| tree | 8446f6aae86530a8546caa99af6f9bac4f095370 /gradle/wrapper/gradle-wrapper.properties | |
| parent | d27925ad19b6800658a69670ceaed261776ba6d3 (diff) | |
| parent | dcaac4f85f07efff2fdfd8a2eec9ba8ee758659c (diff) | |
| download | open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.gz open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.tar.bz2 open-keychain-a4b7daf266b037c6a39cef0586aadedf32861ad5.zip | |
Merge branch 'development' into linked-identities
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'gradle/wrapper/gradle-wrapper.properties')
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 120a028f4..8308df30c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 04 18:50:40 CET 2014 +#Mon Mar 23 19:39:48 CET 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip |