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

Merge branch 'fullyDecentrilizedChannels' into 'release' 

Updates to match the client fullyDecentrilizedChannels branch

See merge request !8
parents b4f099f9 1942b2fb
No related branches found
No related tags found
2 merge requests!60Revert "Fail a test to be sure it works",!8Updates to match the client fullyDecentrilizedChannels branch
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 758 additions and 224 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