# 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 110 contract spam protection
str-mv 2020-12-02 #82ca9c1
Flexi logger update
usetech-llc 2020-12-17 #4173721
- Implement spam protection for smart contracts
Greg Zaitsev 2020-12-02 #33c31e8
- Flexi logger update
str-mv 2020-12-16 #f46510a
Update build steps in README and cleanup
Antz0x0z 2020-12-23 #8686594
- Merge branch 'develop' into feature/NFTPAR-240
Greg Zaitsev 2020-12-23 #fbf1789
NFTPAR-215 Vesting Pallet
str-mv 2020-12-22 #cf6c066
- Merge branch 'develop' into feature/NFTPAR-240
Greg Zaitsev 2020-12-21 #3db9a79
- Merge branch 'feature/NFTPAR-96' of github.com:usetech-llc/nft_private into feature/NFTPAR-96
sotmorskiy 2020-11-26 #5f15b48
Add chain spec entries for system properties and vesting
str-mv 2020-12-22 #73f8e68
- Add test for vesting pallet presence, cleanup other tests
Greg Zaitsev 2020-12-22 #5d12903
- 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
- Add chain spec entries for system properties and vesting
Greg Zaitsev 2020-12-22 #0032fbb
# Conflicts:
# pallets/nft/src/lib.rs
# pallets/nft/src/tests.rs
sotmorskiy 2020-11-26 #5ecbc86
Feature/nftpar 109 110 contract sponsoring
str-mv 2020-11-06 #c8be66f
Feature/nftpar 116 substrate2 release
usetech-llc 2020-10-29 #3370e8a