# Conflicts:
# tests/package.json
kpozdnikin 2021-01-18 #9ecb329
Feature/nftpar 235 258
Greg Zaitsev 2021-01-18 #07025d8
Unit tests and overflow bug fixed
Greg Zaitsev 2021-01-15 #42edda1
- Merge branch 'develop' into feature/NFTPAR-288
Greg Zaitsev 2021-01-26 #d9abff9
Feature/nftpar 236 burn item
str-mv 2021-01-14 #147c892
# Conflicts:
# tests/src/createCollection.test.ts
# tests/src/util/helpers.ts
kpozdnikin 2021-01-15 #f8c3f30
Feature/NFTPAR-237
Greg Zaitsev 2020-12-29 #a9dbb97
- Merge branch 'develop' into feature/NFTPAR-268_inregration_test_broken
Greg Zaitsev 2020-12-30 #537f33b