# Conflicts:
# tests/src/contracts.test.ts
kpozdnikin 2020-12-29 #bda8c76
- Merge remote-tracking branch 'origin/develop' into develop
kpozdnikin 2020-12-18 #ac63732
Feature/nftpar 164
usetech-llc 2020-12-17 #98af5e3
Feature/nftpar 110 contract spam protection
str-mv 2020-12-02 #82ca9c1
NFTPAR-231
usetech-llc 2020-12-25 #d430fcf
Unit tests updated
Greg Zaitsev 2020-12-02 #61a5f4d
- Unit tests updated
str-mv 2020-12-02 #a43e0b9
NFTPAR-118. Per Collection Limits
Greg Zaitsev 2020-12-15 #e0e89b1
- NFTPAR-164. Schema version
str-mv 2020-12-17 #944d507
- Merge branch 'develop' into feature/NFTPAR-250
Greg Zaitsev 2020-12-25 #f4dfc50
Fix contract stponsoring rate limit enforcement
str-mv 2020-12-11 #c313f34
- NFTPAR-231 Smart Contract White List. Integration tests for smart contract white list. Also changed white list to double map.
sotmorskiy 2020-12-24 #b709232
Feature/nftpar-96
Greg Zaitsev 2020-11-26 #73335ba
- Merge branch 'feature/NFTPAR-96' of github.com:usetech-llc/nft_private into feature/NFTPAR-96
sotmorskiy 2020-11-26 #5f15b48
Feature/NFTPAR-183 Storage Refactoring.
usetech-llc 2020-12-11 #71e3eed
Feature/nftpar-142
str-mv 2020-11-16 #eaea941
- Resolved merge conflicts.
sotmorskiy 2020-11-26 #424f9cb
- Merge branch 'develop' into feature/NFTPAR-96
Greg Zaitsev 2020-11-24 #46fa525
NFTPAR-162. Move contracts to tombstone when evicted
usetech-llc 2020-12-09 #68e6834
Unit tests repaired
usetech-llc 2020-11-09 #6d406a4
# Conflicts:
# pallets/nft/src/lib.rs
# pallets/nft/src/tests.rs
sotmorskiy 2020-11-26 #5ecbc86
- NFTPAR-96: Batch Minting.
sotmorskiy 2020-10-16 #31f6053
Configure treasury
str-mv 2020-12-09 #f1b5374
- Update custom types
str-mv 2020-12-11 #c36ef78
- Unit tests repaired
str-mv 2020-11-09 #5f252d9
- NFTPAR-142 Off-chain and on-chain data schema. Fixed tests.
sotmorskiy 2020-11-11 #de2d5e1
Transfer rate limit + chain bounds
Greg Zaitsev 2020-10-13 #0dbd5dd
Feature/nftpar 116 substrate2 release
usetech-llc 2020-10-29 #3370e8a