diff options
| author | David Luhmer <david-dev@live.de> | 2021-01-26 17:31:33 +0300 |
|---|---|---|
| committer | David Luhmer <david-dev@live.de> | 2021-01-26 17:31:33 +0300 |
| commit | b449af345ba2dcded368fa028d9c1bfb43dc72df (patch) | |
| tree | 607e861d3149cefb01f20ebcf586c8f9c8a8391f /gradle | |
| parent | 78bc097307ea58b69c34e8d73ea6ab0df73debef (diff) | |
| parent | 6911c82dc185e572549e2923b2b3c43a184f0598 (diff) | |
Merge branch 'master' into use-viewbinding
# Conflicts:
# gradle/wrapper/gradle-wrapper.properties
Diffstat (limited to 'gradle')
| -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 15b7ab74..969439c0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Dec 27 15:57:12 CET 2020 +#Fri Dec 04 19:59:05 CET 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip |