Code

Resolve conflict#386

Code

Merged

liam-lai merged 5 commits intodev-upgradeXinFinOrg/XDPoSChain:dev-upgradefrom resolve-conflictXinFinOrg/XDPoSChain:resolve-conflictCopy head branch name to clipboardDec 28, 2023

Commits

Commits on Dec 1, 2023

• Merge pull request #373 from XinFinOrg/dev-upgrade

  Show description for 5a9edbd
  liam-lai

  authored
  5a9edbd

  Copy full SHA for 5a9edbd

Commits on Dec 4, 2023

• Merge pull request #375 from XinFinOrg/dev-upgrade

  AnilChinchawale

  authored
  287ca51

  Copy full SHA for 287ca51

Commits on Dec 15, 2023

• set version 1.5.0 for stable version

  

  Liam Lai

  committed
  61dfb51

  Copy full SHA for 61dfb51

• Merge pull request #379 from XinFinOrg/set-version-1.5.0

  AnilChinchawale

  authored
  f3a278c

  Copy full SHA for f3a278c

Commits on Dec 27, 2023

• resolve conflict

  

  Liam Lai

  authored and

  Liam Lai

  committed
  fcef3d2

  Copy full SHA for fcef3d2