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

Merge branch 'restructure' of git.xx.network:elixxir/client into XX-3880/GenericFileTransfer 

 Conflicts:
	groupChat/manager.go
	groupChat/receive.go
	groupChat/send.go
parents 871d581c b053970e
Hide whitespace changes
Inline Side-by-side
Showing
No files found.
with 0 additions and 0 deletions
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