CalDescent f3ef112297 Merge remote-tracking branch 'qortal/master' ...

# Conflicts:
#	.gitignore
#	pom.xml
#	src/main/java/org/qortal/controller/Controller.java
#	src/main/java/org/qortal/gui/SysTray.java
#	src/main/java/org/qortal/settings/Settings.java
#	src/main/resources/i18n/ApiError_en.properties
#	src/test/java/org/qortal/test/CryptoTests.java
#	src/test/resources/test-settings-v2.json

2021-10-15 09:03:28 +01:00

..

java/org/qortal/test

Merge remote-tracking branch 'qortal/master'

2021-10-15 09:03:28 +01:00

resources

Merge remote-tracking branch 'qortal/master'

2021-10-15 09:03:28 +01:00