Skip to content
Commit f9a5a356 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 bugfix/6411/chat-scrolling-issue-when-picture
parents 8aac0c99 5183edf4
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