# Conflicts:
# tests/package-lock.json
# tests/src/substrate/substrate-api.ts
kpozdnikin 2021-02-02 #ffe7ca2
# Conflicts:
# tests/package.json
kpozdnikin 2021-01-18 #9ecb329
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
Feature/nftpar 234
Greg Zaitsev 2021-01-19 #8a8e3dd
- Remove .only from burnItem tests
Greg Zaitsev 2021-01-14 #c356c0a
Feature/nftpar 257
Greg Zaitsev 2021-01-19 #2390e16
- Merge branch 'develop' into feature/NFTPAR-236_burn_item
Greg Zaitsev 2021-01-14 #dd88245
# Conflicts:
# tests/src/createCollection.test.ts
# tests/src/util/helpers.ts
kpozdnikin 2021-01-15 #af9de18
- Fix transferFrom
Greg Zaitsev 2021-01-15 #ed27109