Code

Resolve conflicts#3205

Code

Merged

NZT48 merged 10 commits intov6/prerelease/devnetOriginTrail/ot-node:v6/prerelease/devnetfrom v6/developOriginTrail/ot-node:v6/developCopy head branch name to clipboardJun 13, 2024

Commits

Commits on Apr 18, 2024

• Merge pull request #3133 from OriginTrail/v6/development-network

  Show description for 7419584
  djordjekovac

  authored
  7419584

  Copy full SHA for 7419584

Commits on Apr 19, 2024

• Merge pull request #3143 from OriginTrail/v6/development-network

  Show description for 3bcb8a0
  djordjekovac

  authored
  3bcb8a0

  Copy full SHA for 3bcb8a0

Commits on Apr 23, 2024

• Merge pull request #3149 from OriginTrail/v6/development-network

  Show description for 5ab173b
  djordjekovac

  authored
  5ab173b

  Copy full SHA for 5ab173b

Commits on Apr 24, 2024

• Merge pull request #3155 from OriginTrail/v6/development-network

  Show description for ca455c2
  djordjekovac

  authored
  ca455c2

  Copy full SHA for ca455c2

Commits on Jun 5, 2024

• Merge pull request #3182 from OriginTrail/v6/development-network

  Show description for 33b2bd8
  NZT48

  authored
  33b2bd8

  Copy full SHA for 33b2bd8

Commits on Jun 7, 2024

• OriginTrail Devnet Release v6.4.0 Hotfix 5 (#3189)

  Show description for 4fe30a8
  

  4 peopleauthored
  4fe30a8

  Copy full SHA for 4fe30a8

• Merge branch 'v6/prerelease/testnet' into v6/development-network

  Mihajlo-Pavlovic

  authored
  452adf5

  Copy full SHA for 452adf5

Commits on Jun 13, 2024

• Merge pull request #3198 from OriginTrail/v6/prerelease/devnet

  Show description for e82fe82
  NZT48

  authored
  e82fe82

  Copy full SHA for e82fe82

• resolve conflicts

  NZT48

  committed
  fce7c10

  Copy full SHA for fce7c10

• Merge branch 'v6/prerelease/devnet' into v6/develop

  NZT48

  authored
  5fde905

  Copy full SHA for 5fde905