- Merge branch 'develop' into feature/NFTPAR-96
- Merge pull request #20 from usetech-llc/feature/NFTPAR-95
# Conflicts: # pallets/nft/src/lib.rs # pallets/nft/src/tests.rs
Feature/nftpar 116 substrate2 release
- Merge branch 'master' into update/v2
runtime/build.rs226 Bsourcehistory# Conflicts: # pallets/nft/src/lib.rs # pallets/nft/src/tests.rs
Feature/nftpar 116 substrate2 release