Merge branch 'amorgan-next-patch-81816' into 'next'

Add 'Federation publicRoom Name/topic keys are correct' test to sytest whitelist See merge request famedly/conduit!221
4 years ago · 5ae753b2e7
1 changed files with 1 additions and 0 deletions
--- a/tests/sytest/sytest-whitelist
+++ b/tests/sytest/sytest-whitelist
@ -510,3 +510,4 @@ remote user can join room with version 5
				@@ -510,3 +510,4 @@ remote user can join room with version 5
 remote user can join room with version 6
 setting 'm.room.name' respects room powerlevel
 setting 'm.room.power_levels' respects room powerlevel
+Federation publicRoom Name/topic keys are correct