git.delta.rocks / unique-network / refs/commits / e713e8976087

difftreelog

commits

node/src/chain_spec.rs7.1 KiBsourcehistory
  1. Merge branch 'master' into release/v2.0.0
    Greg Zaitsev 2021-02-05 #b1f8c2e
  2. Merge remote-tracking branch 'origin/develop' into feature/NFTPAR-241
    # Conflicts:
#	tests/package-lock.json
#	tests/src/substrate/substrate-api.ts
    kpozdnikin 2021-02-02 #ffe7ca2