mirror of
https://github.com/Qortal/qortal.git
synced 2025-02-11 17:55:50 +00:00
# Conflicts: # pom.xml # src/main/java/org/qortal/api/ApiError.java # src/main/java/org/qortal/settings/Settings.java # src/main/resources/i18n/ApiError_en.properties