This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

IS-1049: Fix some conflicts on merging master to develop#436

Merged

goldworm-icon merged 22 commits intodevelopfrom IS-1049-merge-hotfix-1-6-1

Apr 10, 2020

+320-79

Commits on Jan 20, 2020

Merge pull request #405 from icon-project/release-1.6.0
Chiwon Cho
authored

Commits on Feb 29, 2020

Commits on Mar 2, 2020

IS-1021: DictDB iteration causes infinite loop
cow-hs
committed
Optimize Timer class
Chiwon Cho
committed

Commits on Mar 3, 2020

Merge pull request #418 from icon-project/IS-1015-tx-number-adjustion-in-block
Chiwon Cho
authored

Commits on Mar 5, 2020

apply feedback
cow-hs
committed
Add sha_256 function for SCORE development

goldworm-icon
authored and
Chiwon Cho
committed
Merge pull request #422 from icon-project/IS-1024-sha-256-score-func-support
Chiwon Cho
authored

Commits on Mar 6, 2020

Merge pull request #420 from icon-project/IS-1021-dict-db-iteration-causes-infinite-loop
Chiwon Cho
authored

Commits on Mar 11, 2020

IS-1029: Array Optimization hotfix (#424 )

cow-hs
and
goldworm-icon
authored

Commits on Mar 16, 2020

VERSION: 1.6.1rc1
goldworm-icon
committed

Commits on Mar 24, 2020

IS-1042 fix Fee 2.0 bug
eunsoopark
committed
Merge pull request #429 from icon-project/IS-1042-fix-fee2-error-withdraw-with-penalty
eunsoo-icon
authored
VERSION: 1.6.1rc3
yakkle
committed

Commits on Apr 1, 2020

Commits on Apr 8, 2020

Merge branch 'master' into IS-1049-merge-hotfix-1-6-1
goldworm-icon
committed