Merge branch 'master' into release/1.16

host6 · host6 · commit 330b830102f2 · 2018-01-23T18:08:28.000+03:00
# Conflicts:
#	version
diff --git a/build.gradle b/build.gradle
@@ -54,6 +54,7 @@ dependencies {
 	}
 	compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'
 	compile 'org.apache.commons:commons-lang3:3.5'
+	compile 'commons-io:commons-io:2.6'
 	
 	testCompile 'org.mockito:mockito-core:2.0.62-beta'
 	testCompile 'junit:junit:4.12'

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,7 @@ dependencies {`
`54`	`54`	`}`
`55`	`55`	`compile 'org.eclipse.jgit:org.eclipse.jgit:4.3.0.201604071810-r'`
`56`	`56`	`compile 'org.apache.commons:commons-lang3:3.5'`
	`57`	`+ compile 'commons-io:commons-io:2.6'`
`57`	`58`
`58`	`59`	`testCompile 'org.mockito:mockito-core:2.0.62-beta'`
`59`	`60`	`testCompile 'junit:junit:4.12'`