Merge branch '6.0.x'

# Conflicts: # build.gradle
3 years ago · 49547fc710
1 changed files with 1 additions and 1 deletions
--- a/build.gradle
+++ b/build.gradle
@ -7,7 +7,7 @@ plugins {
				@@ -7,7 +7,7 @@ plugins {
 	id 'com.github.ben-manes.versions' version '0.46.0'
 	id 'com.github.johnrengelman.shadow' version '8.1.1' apply false
 	id 'de.undercouch.download' version '5.4.0'
-	id 'me.champeau.jmh' version '0.7.0' apply false
+	id 'me.champeau.jmh' version '0.7.1' apply false
 	id 'me.champeau.mrjar' version '0.1.1'
 }