Skip to content
Snippets Groups Projects
Commit e20ef24c authored by Eliot Berriot's avatar Eliot Berriot
Browse files

Merge branch '170-federation' into 'develop'

See #170: federation for channels

Closes #961

See merge request !969
parents c3cb8bc3 5a37d977
No related branches found
No related tags found
No related merge requests found
Showing
with 329 additions and 36 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 to comment