Merge branch 'upstream-master' into upstream

Browse Source

# Conflicts:
#	cache/pom.xml
#	pom.xml
#	runelite-api/src/main/java/net/runelite/api/kit/KitType.java
#	runelite-client/pom.xml
#	runelite-client/src/test/java/net/runelite/client/plugins/chatnotifications/ChatNotificationsPluginTest.java

...

This commit is contained in:

TheRealNull

2021-01-20 12:04:46 -08:00

parent 0147abf768 087da07648

commit 17a2f2f0a4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available