Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
master
Keith 2016-06-22 20:39:23 -04:00
commit 43d7680ba2
2 changed files with 0 additions and 6 deletions

Binary file not shown.

View File

@ -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