diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-12-31 06:24:05 -0500 |
| commit | ba1ef7a38e1d923d1e0e31f0e16528649df41af8 (patch) | |
| tree | b4501c25bb06b084f324f525a6ab2dfe5037aa78 /gradle/wrapper | |
| parent | a782c3f83e6f40ad24f6ffbb3fa5b0d5b4f409f5 (diff) | |
| parent | 893e0ce89daaa39f1157298c6a8dd10b7e98eceb (diff) | |
Merge branch 'upstream' into webview
Conflicts:
app/build.gradle
Diffstat (limited to 'gradle/wrapper')
| -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 68e02ebb..1a704461 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Dec 04 19:46:18 CET 2014 +#Wed Dec 23 00:45:56 EST 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip |