# Conflicts:
# tests/src/contracts.test.ts
kpozdnikin 2020-12-29 #bda8c76
- Merge remote-tracking branch 'origin/develop' into develop
kpozdnikin 2020-12-18 #ac63732
NFTPAR-260_217. Benchmarks
usetech-llc 2020-12-25 #a9a8865
- NFTPAR-260_217. Benchmarks
str-mv 2020-12-25 #57a41c1
Fix contract stponsoring rate limit enforcement
str-mv 2020-12-11 #c313f34
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-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
# Conflicts:
# pallets/nft/src/lib.rs
# pallets/nft/src/tests.rs
sotmorskiy 2020-11-26 #5ecbc86
Feature/nftpar 116 substrate2 release
usetech-llc 2020-10-29 #3370e8a