# Conflicts:
# tests/package.json
kpozdnikin 2021-01-18 #9ecb329
Feature/nftpar 235 258
Greg Zaitsev 2021-01-18 #07025d8
- tests fixes
kpozdnikin 2021-01-18 #b05ce7a
- transferFrom tests
kpozdnikin 2021-01-18 #be0c28a
- Merge branch 'develop' into feature/NFTPAR-288
Greg Zaitsev 2021-01-26 #d9abff9
# Conflicts:
# tests/src/createCollection.test.ts
# tests/src/util/helpers.ts
kpozdnikin 2021-01-15 #af9de18
- Fix transferFrom
Greg Zaitsev 2021-01-15 #ed27109
- approve and transferFrom test scenarios
kpozdnikin 2021-01-15 #3ed9616
- Merge branch 'develop' into feature/NFTPAR-235-258
Greg Zaitsev 2021-01-15 #efec843
- approve and transferFrom test scenarios
kpozdnikin 2021-01-13 #c980d88
Feature/nftpar 288
Greg Zaitsev 2021-01-18 #d488824