Merge branch 'master' into maven

2019-07-11 00:48:18 -04:00
parent f6bd333975 eaeedbaadb
commit 26fbf876ff
96 changed files with 6320 additions and 3754 deletions
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -290,6 +290,16 @@
 			<version>3.2.0</version>
 			<scope>compile</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore</artifactId>
+			<version>4.4.11</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpmime</artifactId>
+			<version>4.5.9</version>
+		</dependency>
 	</dependencies>

 	<build>