Merge branch 'develop' into f/javafx

Browse Source

Conflicts:
	src/main/java/envoy/client/ui/container/LoginDialog.java
	src/main/java/envoy/client/ui/primary/PrimaryScrollPane.java
	src/main/java/envoy/client/ui/primary/PrimaryTextArea.java
	src/main/java/envoy/client/ui/renderer/UserListRenderer.java
	src/main/java/envoy/client/ui/settings/GeneralSettingsPanel.java
	src/main/java/envoy/client/ui/settings/ThemeCustomizationPanel.java

...

This commit is contained in:

Kai S. K. Engelbart 2020-06-07 12:09:31 +02:00

parent 9e7bde1d4d 393bec735c

commit cb395c808c

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

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

Diff Content Not Available