# Conflicts:
# tests/package-lock.json
# tests/package.json
sotmorskiy 2020-10-05 #8eb82cd
Feature/nftpar 91
usetech-llc 2020-10-02 #ab1a681
- Merge branch 'master' into update/v2
Greg Zaitsev 2020-09-17 #8d30d14
Feature/white list tests
usetech-llc 2020-10-02 #3f41342
- Code style update
str-mv 2020-09-09 #7a21a78
- add extra genesis
str-mv 2020-09-30 #5c8bf09
- Merge branch 'master' of github.com:usetech-llc/nft_parachain
Greg Zaitsev 2020-07-27 #b6babd2
- ItemCreated Event changed
str-mv 2020-07-27 #9f0b3c2
- Merge branch 'master' of https://github.com/usetech-llc/nft_parachain
str-mv 2020-07-22 #4fc7c3c
- Updated to rc4
str-mv 2020-07-22 #5e168aa
- Fix build
Greg Zaitsev 2020-07-20 #f40188f