Skip to content
Snippets Groups Projects
Commit 38ead946 authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files

Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links

parents bef1d6f3 286d6930
No related branches found
No related tags found
Loading
Showing
with 41 additions and 70 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