Skip to content
Commit ce261e57 authored by Nikola's avatar Nikola
Browse files

Merge branch 'master' of gladovic.github.com:nextcloud/spreed into... 

Merge branch 'master' of gladovic.github.com:nextcloud/spreed into feature/6438-add-margin-right-panel-1n1-chat
parents c15bef8b 61ca0b37
Hide whitespace changes
Inline Side-by-side
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