Skip to content
Snippets Groups Projects
Commit 150a1eac authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge branch 'release' of git.xx.network:elixxir/client into XX-3617/fasterFileTransfer 

 Conflicts:
	cmd/fileTransfer.go
	fileTransfer/receive.go
	fileTransfer/receiveNew.go
	fileTransfer/send.go
parents 7a2eb069 64cd040a
Branches
Tags
2 merge requests!117Release,!105XX-3617 / faster file transfer
Show whitespace changes
Inline Side-by-side
Showing
with 115 additions and 75 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment