CalDescent
ef29eeac16
Merge branch 'master' into pirate-chain; fix translation conflicts
# Conflicts:
# qortal-ui-core/language/de.json
# qortal-ui-core/language/es.json
# qortal-ui-core/language/fr.json
# qortal-ui-core/language/hindi.json
# qortal-ui-core/language/hr.json
# qortal-ui-core/language/hu.json
# qortal-ui-core/language/it.json
# qortal-ui-core/language/ko.json
# qortal-ui-core/language/no.json
# qortal-ui-core/language/pl.json
# qortal-ui-core/language/pt.json
# qortal-ui-core/language/ro.json
# qortal-ui-core/language/rs.json
# qortal-ui-core/language/ru.json
# qortal-ui-core/language/us.json
# qortal-ui-core/language/zhc.json
# qortal-ui-core/language/zht.json
# qortal-ui-plugins/plugins/core/trade-portal/trade-portal.src.js
2022-08-19 14:04:07 +01:00
..
2022-08-19 14:04:07 +01:00
2022-08-06 18:13:35 +03:00
2022-02-10 00:38:06 -08:00
2022-02-10 00:38:06 -08:00
2022-02-10 00:38:06 -08:00
2022-08-18 12:44:40 +02:00
2021-12-25 14:39:47 +01:00