Merge branch 'master' of https://github.com/spacemeshos/api

# Conflicts: # release/go/spacemesh/v1/types.pb.go
spacemeshos · Jul 18, 2021 · f54df33 · f54df33
1 parent eb70040
commit f54df33
Show file tree

Hide file tree

Showing 3 changed files with 129 additions and 130 deletions.
diff --git a/release/go/spacemesh/v1/smesher.pb.go b/release/go/spacemesh/v1/smesher.pb.go
diff --git a/release/go/spacemesh/v1/smesher_types.pb.go b/release/go/spacemesh/v1/smesher_types.pb.go