# 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
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
- Merge branch 'develop' into feature/NFTPAR-288
Greg Zaitsev 2021-01-26 #d9abff9
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
- 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
- Merge branch 'develop' into feature/NFTPAR-237
sotmorskiy 2020-12-29 #e4d811f
- Add burn integration tests
Greg Zaitsev 2021-01-14 #91a71ac
- approve and transferFrom test scenarios
kpozdnikin 2021-01-15 #3ed9616
- Merge branch 'develop' into feature/NFTPAR-235-258
Greg Zaitsev 2021-01-15 #efec843
- NFTPAR-237 Integration Test changeCollectionOwner(collection_id, new_owner).
sotmorskiy 2020-12-28 #91e3663
- Merge remote-tracking branch 'origin/develop' into feature/NFTPAR-265
kpozdnikin 2020-12-29 #aabcd75
- Merge branch 'develop' of https://github.com/usetech-llc/nft_private into develop
str-mv 2021-01-12 #1b2f5b5
Feature/nftpar 288
Greg Zaitsev 2021-01-18 #d488824
Update build steps in README and cleanup
Antz0x0z 2020-12-23 #8686594
# Conflicts:
# tests/src/contracts.test.ts
kpozdnikin 2020-12-29 #bda8c76