Merge upstream changes

This commit is contained in:
NerdNumber9
2017-11-23 21:03:49 -05:00
committed by NerdNumber9
210 changed files with 6140 additions and 1779 deletions

View File

@ -1,6 +1,6 @@
#Fri Mar 03 16:14:18 CET 2017
#Wed Oct 25 23:17:30 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip