Commit 502d79e7 authored by Maxime Buquet's avatar Maxime Buquet

Merge branch 'fix-issue-history-no-mam' into 'master'

Fix an issue on join when the room has no MAM support

See merge request !136
parents f670e3ce 64561bcf
Pipeline #3237 passed with stages
in 6 minutes and 58 seconds