# Conflicts:
# tests/package-lock.json
# tests/src/substrate/substrate-api.ts
kpozdnikin 2021-02-02 #ffe7ca2
- Merge branch 'develop' into feature/NFTPAR-288
Greg Zaitsev 2021-01-26 #d9abff9
Feature/nftpar 234
Greg Zaitsev 2021-01-19 #8a8e3dd
Feature/nftpar 257
Greg Zaitsev 2021-01-19 #2390e16
Feature/NFTPAR-237
Greg Zaitsev 2020-12-29 #a9dbb97
- Merge branch 'develop' into feature/NFTPAR-268_inregration_test_broken
Greg Zaitsev 2020-12-30 #537f33b
- Fix transfer test (with burned tokens)
Greg Zaitsev 2021-01-19 #fdbcd55
- Merge branch 'develop' into feature/NFTPAR-237
sotmorskiy 2020-12-29 #e4d811f