Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

client
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Contributor analytics
- Model experiments

Snippets Groups Projects

2cf0bb10

Commit 2cf0bb10 authored 4 years ago by Benjamin Wenger

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/origin/release' into Ursula/UD

# Conflicts:
#	go.mod
#	go.sum
#	ud/udMessages.pb.go
#	ud/udMessages.proto

parents 47e7e5a5 319084b7

No related branches found

No related tags found

No related merge requests found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cmd/root.go 4 additions, 4 deletions

cmd/root.go
go.mod 2 additions, 3 deletions

go.mod
go.sum 19 additions, 9 deletions

go.sum
network/follow.go 8 additions, 3 deletions

network/follow.go
network/message/handler.go 1 addition, 1 deletion

network/message/handler.go
network/rounds/retrieve.go 3 additions, 0 deletions

network/rounds/retrieve.go
storage/auth/store.go 2 additions, 2 deletions

storage/auth/store.go
storage/e2e/session.go 4 additions, 0 deletions

storage/e2e/session.go
storage/e2e/store.go 0 additions, 1 deletion

storage/e2e/store.go
storage/regCode.go 4 additions, 3 deletions

storage/regCode.go
ud/udMessages.pb.go 235 additions, 431 deletions

ud/udMessages.pb.go

with 282 additions and 457 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment