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

Merge branch 'release' of git.xx.network:elixxir/client into hotfix/groupNotification 

 Conflicts:
	groupChat/manager.go
parents dad5702d 7d643227
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 6 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment