# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
- Merge branch 'develop' into feature/NFTPAR-288
Feature/nftpar 234
Feature/NFTPAR-237
tests/src/transfer.test.ts8.7 KiBsourcehistory# Conflicts: # tests/package-lock.json # tests/src/substrate/substrate-api.ts
Feature/nftpar 234
Feature/NFTPAR-237