# Conflicts:
# tests/src/contracts.test.ts
kpozdnikin 2020-12-29 #bda8c76
- Merge remote-tracking branch 'origin/develop' into develop
kpozdnikin 2020-12-18 #ac63732
Update build steps in README and cleanup
Antz0x0z 2020-12-23 #8686594
Fix contract stponsoring rate limit enforcement
str-mv 2020-12-11 #c313f34
- Update build steps in README and cleanup
Greg Zaitsev 2020-12-22 #d49cd5a
- Merge branch 'develop' into feature/NFTPAR-240
Greg Zaitsev 2020-12-23 #fbf1789
Move runtime types to JSON file, update tests
str-mv 2020-12-11 #8f2e7cc
- 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
- Merge branch 'develop' into feature/NFTPAR-96
Greg Zaitsev 2020-11-24 #46fa525
- Move runtime types to JSON file, update tests
Greg Zaitsev 2020-12-11 #3c67ef3
- NFTPAR-142 Off-chain and on-chain data schema. Updated custom types.
sotmorskiy 2020-11-12 #eca8c84
# Conflicts:
# pallets/nft/src/lib.rs
# pallets/nft/src/tests.rs
sotmorskiy 2020-11-26 #5ecbc86
- NFTPAR-183: Storage Refactoring. Fixed custom UI types.
sotmorskiy 2020-12-11 #b7831a8
Feature/nftpar 116 substrate2 release
usetech-llc 2020-10-29 #3370e8a