Zeruth 1cb65fb1e0 Merge branch 'master-2' ...

finishes merge

# Conflicts:
#	http-service/src/main/java/net/runelite/http/service/config/ConfigService.java
#	http-service/src/main/java/net/runelite/http/service/hiscore/HiscoreService.java
#	http-service/src/test/java/net/runelite/http/service/config/ConfigControllerTest.java
#	http-service/src/test/java/net/runelite/http/service/loottracker/LootTrackerControllerTest.java
#	injector-plugin/src/test/java/net/runelite/injector/InjectTest.java
#	runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
#	runelite-client/src/main/java/net/runelite/client/plugins/dailytaskindicators/DailyTasksPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeSearchPanel.java
#	runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mining/MiningPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/mta/telekinetic/TelekineticRoom.java
#	runelite-client/src/main/java/net/runelite/client/plugins/party/PartyPlugin.java
#	runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldSwitcherPanel.java

2019-07-12 16:34:04 -04:00

..

src

Merge branch 'master-2'

2019-07-12 16:34:04 -04:00

pom.xml

Merge branch 'master' into maven

2019-07-11 00:48:18 -04:00