# Conflicts:
# tests/src/contracts.test.ts
kpozdnikin 2020-12-29 #bda8c76
Update build steps in README and cleanup
Antz0x0z 2020-12-23 #8686594
Update license information
usetech-llc 2020-12-22 #79b6c15
- Merge branch 'develop' into feature/NFTPAR-240
Greg Zaitsev 2020-12-23 #fbf1789
- Update license information
Greg Zaitsev 2020-12-22 #0333d12
- Merge branch 'develop' into feature/NFTPAR-96
Greg Zaitsev 2020-11-24 #46fa525
# Conflicts:
# pallets/nft/src/lib.rs
# pallets/nft/src/tests.rs
sotmorskiy 2020-11-26 #5ecbc86