# Conflicts:
# tests/src/contracts.test.ts
kpozdnikin 2020-12-29 #bda8c76
- Merge remote-tracking branch 'origin/develop' into develop
kpozdnikin 2020-12-18 #ac63732
Flexi logger update
usetech-llc 2020-12-17 #4173721
- Flexi logger update
str-mv 2020-12-16 #f46510a
Fix contract stponsoring rate limit enforcement
str-mv 2020-12-11 #c313f34
- Merge branch 'develop' into feature/NFTPAR-240
Greg Zaitsev 2020-12-23 #fbf1789
NFTPAR-215 Vesting Pallet
str-mv 2020-12-22 #cf6c066
- 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
# 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