Merge remote-tracking branch 'origin/master'

Browse source

# Conflicts:
#	src/main/java/nsusbloader/AppPreferences.java
#	src/main/java/nsusbloader/Controllers/NSLMainController.java
#	src/main/java/nsusbloader/Controllers/SettingsController.java
#	src/main/resources/SettingsTab.fxml
#	src/main/resources/locale.properties
#	src/main/resources/locale_fra.properties
#	src/main/resources/locale_rus.properties
#	src/main/resources/locale_ukr.properties

...

This commit is contained in:

Dmitry Isaenko 2019-04-28 03:12:06 +03:00

parent b7c2dfe504 f92bf6d6d4

commit 0111a81721

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 is not available