Merge remote-tracking branch 'orig_upstream/master' into ext

# Conflicts:
#	runelite-client/pom.xml
This commit is contained in:
Lucas
2019-04-25 14:32:16 +02:00
25 changed files with 989 additions and 996 deletions

View File

@@ -29,7 +29,7 @@
<parent>
<groupId>net.runelite</groupId>
<artifactId>runelite-parent</artifactId>
<version>1.5.21-SNAPSHOT</version>
<version>1.5.22-SNAPSHOT</version>
</parent>
<groupId>net.runelite.rs</groupId>