Merge remote-tracking branch 'origin/master'
# Conflicts: # gradle/wrapper/gradle-wrapper.propertiesmaster
commit
43d7680ba2
Binary file not shown.
|
@ -1,6 +0,0 @@
|
||||||
#Tue Jun 14 18:35:52 EDT 2016
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip
|
|
Loading…
Reference in New Issue