Merge remote-tracking branch 'upstream/master' into Zip-slip-vulnerability

This commit is contained in:
William Collishaw
2019-05-26 14:51:34 -06:00
75 changed files with 1930 additions and 899 deletions

View File

@@ -28,7 +28,7 @@
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.24-SNAPSHOT</version>
<version>1.5.25-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RuneLite</name>
@@ -43,7 +43,7 @@
<maven.javadoc.skip>true</maven.javadoc.skip>
<checkstyle.skip>true</checkstyle.skip>
<rs.version>179</rs.version>
<rs.version>180</rs.version>
</properties>
<licenses>