Skip to content

Update develop after hotfix was merged in master#918

Merged
Lainaaa merged 9 commits into
developfrom
merge_master_into_dev
Sep 24, 2025
Merged

Update develop after hotfix was merged in master#918
Lainaaa merged 9 commits into
developfrom
merge_master_into_dev

Conversation

@Lainaaa

@Lainaaa Lainaaa commented Sep 23, 2025

Copy link
Copy Markdown
Member

Description

In master hotifx was pushed.
This PR should also update develop branch within latest master changes.

Lainaaa and others added 9 commits September 2, 2025 11:42
[Trello.com/c/d05y5j] Hotfix: `count` field type (Release v3.10.1)
# Conflicts:
#	Adamant.xcodeproj/project.pbxproj
#	Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Adamant/Helpers/Markdown+Adamant.swift
#	Adamant/Models/EthTransaction.swift
#	Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift
#	Adamant/Modules/Wallets/Ethereum/EthApiService.swift
#	Adamant/Modules/Wallets/Ethereum/EthWalletService.swift
@Lainaaa Lainaaa merged commit 5191cb7 into develop Sep 24, 2025
1 check passed
@Lainaaa Lainaaa deleted the merge_master_into_dev branch September 24, 2025 11:55

@al-onyxprotocol al-onyxprotocol left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Task] Release iOS/PWA v3.10.1 app in App Store/Google Play

4 participants