Merge branch 'develop' into release

hyle-team · Jul 11, 2024 · 337e882 · 337e882
2 parents 1165101 + c1d3785
commit 337e882
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/contrib/epee/include/serialization/keyvalue_helpers.h b/contrib/epee/include/serialization/keyvalue_helpers.h
@@ -105,7 +105,7 @@ namespace epee
     std::string res;
     for (const auto& item : a)
     {
-      res += epee::string_tools::pod_to_hex(a) + ", ";
+      res += epee::string_tools::pod_to_hex(item) + ", ";
     }
     if (a.size())
     {

diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout
diff --git a/src/version.h.in b/src/version.h.in
@@ -8,6 +8,6 @@
 #define PROJECT_REVISION "0"
 #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION
 
-#define PROJECT_VERSION_BUILD_NO 331
+#define PROJECT_VERSION_BUILD_NO 332
 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO)
 #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"
+9 −6		html/assets/i18n/af.json
+9 −6		html/assets/i18n/ar.json
+9 −6		html/assets/i18n/ca.json
+9 −6		html/assets/i18n/cs.json
+9 −6		html/assets/i18n/da.json
+8 −5		html/assets/i18n/de.json
+9 −6		html/assets/i18n/el.json
+9 −6		html/assets/i18n/en.json
+9 −6		html/assets/i18n/es.json
+9 −6		html/assets/i18n/fi.json
+8 −5		html/assets/i18n/fr.json
+9 −6		html/assets/i18n/he.json
+9 −6		html/assets/i18n/hu.json
+8 −5		html/assets/i18n/id.json
+8 −5		html/assets/i18n/it.json
+9 −6		html/assets/i18n/ja.json
+9 −6		html/assets/i18n/ko.json
+9 −6		html/assets/i18n/nl.json
+9 −6		html/assets/i18n/no.json
+9 −6		html/assets/i18n/pl.json
+8 −5		html/assets/i18n/pt.json
+9 −6		html/assets/i18n/ro.json
+9 −6		html/assets/i18n/ru.json
+9 −6		html/assets/i18n/sr.json
+9 −6		html/assets/i18n/sv.json
+9 −6		html/assets/i18n/tr.json
+9 −6		html/assets/i18n/uk.json
+9 −6		html/assets/i18n/vi.json
+9 −6		html/assets/i18n/zh.json
+455 −405		html/main.js
+1 −1		html/main.js.map
+1 −1		html_source/src/app/pages/wallet/tabs/custom-assets/modals/burn-custom-asset/burn-custom-asset.component.ts
+2 −0		html_source/src/app/pages/wallet/tabs/custom-assets/modals/emit-custom-asset/emit-custom-asset.component.ts
+5 −2		...ource/src/app/pages/wallet/tabs/custom-assets/modals/update-custom-asset/update-custom-asset.component.html
+33 −2		..._source/src/app/pages/wallet/tabs/custom-assets/modals/update-custom-asset/update-custom-asset.component.ts
+1 −1		html_source/src/app/pages/wallet/tabs/custom-assets/pages/create-new-asset/create-new-asset.component.ts
+2 −3		html_source/src/app/pages/wallet/tabs/custom-assets/pages/custom-assets/custom-assets.component.html
+3 −3		html_source/src/app/pages/wallet/wallet/modals/add-custom-token/add-custom-token.component.ts
+3 −3		html_source/src/app/pages/wallet/wallet/wallet.component.ts
+2 −2		html_source/src/app/parts/utils/zano-validators.ts
+9 −6		html_source/src/assets/i18n/af.json
+9 −6		html_source/src/assets/i18n/ar.json
+9 −6		html_source/src/assets/i18n/ca.json
+9 −6		html_source/src/assets/i18n/cs.json
+9 −6		html_source/src/assets/i18n/da.json
+8 −5		html_source/src/assets/i18n/de.json
+9 −6		html_source/src/assets/i18n/el.json
+9 −6		html_source/src/assets/i18n/en.json
+9 −6		html_source/src/assets/i18n/es.json
+9 −6		html_source/src/assets/i18n/fi.json
+8 −5		html_source/src/assets/i18n/fr.json
+9 −6		html_source/src/assets/i18n/he.json
+9 −6		html_source/src/assets/i18n/hu.json
+8 −5		html_source/src/assets/i18n/id.json
+8 −5		html_source/src/assets/i18n/it.json
+9 −6		html_source/src/assets/i18n/ja.json
+9 −6		html_source/src/assets/i18n/ko.json
+9 −6		html_source/src/assets/i18n/nl.json
+9 −6		html_source/src/assets/i18n/no.json
+9 −6		html_source/src/assets/i18n/pl.json
+8 −5		html_source/src/assets/i18n/pt.json
+9 −6		html_source/src/assets/i18n/ro.json
+9 −6		html_source/src/assets/i18n/ru.json
+9 −6		html_source/src/assets/i18n/sr.json
+9 −6		html_source/src/assets/i18n/sv.json
+9 −6		html_source/src/assets/i18n/tr.json
+9 −6		html_source/src/assets/i18n/uk.json
+9 −6		html_source/src/assets/i18n/vi.json
+9 −6		html_source/src/assets/i18n/zh.json
+1 −1		html_source/src/main.ts