Merge remote-tracking branch 'upstream/master' into maven-plugin-upgrades

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

View File

@@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.24-SNAPSHOT</version>
<version>1.5.25-SNAPSHOT</version>
</parent>
<artifactId>protocol-api</artifactId>