4
1
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-02-12 02:05:51 +00:00
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-11 18:42:29 +02:00
2022-08-14 19:32:59 +02:00
2022-06-10 10:54:38 +02:00
2022-05-08 18:27:45 -04:00
2022-04-14 14:22:20 +02:00
2022-08-16 11:05:06 +02:00
2022-03-16 11:17:57 +01:00
2021-12-25 15:46:09 +01:00
2021-12-25 14:39:47 +01:00
2022-08-06 18:13:35 +03:00