Skip to content
Unverified Commit ac9cf0a5 authored by ordian's avatar ordian
Browse files

Merge branch 'master' into ao-bump-rocksdb 

* master:
  node/network/bridge: Define protocol names as str (#1655)
  Companion PR: add weightinfo for collective (#1524)
parents 68521e82 af8dcd08
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment