Merge remote-tracking branch 'origin/translator' into translator

Browse Source

# Conflicts:
#	runelite-client/src/main/java/net/runelite/client/plugins/chattranslation/ChatTranslationConfig.java

...

This commit is contained in:

Ian W. ONeill

2019-07-02 05:27:32 +01:00

parent b21d447aac 65e48ab207

commit 292cce08ad

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