# Conflicts:
# tests/package-lock.json
# tests/package.json
sotmorskiy 2020-10-05 #8eb82cd
Feature/nftpar 91
usetech-llc 2020-10-02 #ab1a681
Feature/white list tests
usetech-llc 2020-10-02 #3f41342
Increase max websocket conncetions to 10K
usetech-llc 2020-09-30 #cf4d1ac
- Increase max websocket conncetions to 10K
Greg Zaitsev 2020-09-30 #293a0c4
- Merge branch 'master' of https://github.com/usetech-llc/nft_parachain
str-mv 2020-07-22 #4fc7c3c
- Merge branch 'master' of https://github.com/usetech-llc/nft_parachain
str-mv 2020-07-21 #21c779f
- Fix node roles, add key file
Greg Zaitsev 2020-07-21 #017a48d
- Add gateway node to testnet - Bohr
Greg Zaitsev 2020-07-21 #9b6878d
- Merge branch 'master' of github.com:usetech-llc/nft_parachain
Greg Zaitsev 2020-07-17 #907c4d4
- Testnet deployment scripts and docker files
Greg Zaitsev 2020-07-21 #eeb5dd0