Files
bundesmessenger-ios/Riot
JanNiklas Grabowski 90701f4d9d Merge commit '17b2fa5409f49e10a7f136101989960a7f50dc73' into feature/5304_us14_add_federation_info_view_for_old_rooms
* commit '17b2fa5409f49e10a7f136101989960a7f50dc73':
  MESSENGER-5386 change alert appearance
  MESSENGER-5386 us17  invite federated users only if room is federated
  fix pipeline
  MESSENGER-5226 us12 federation in timeline header

# Conflicts:
#	Riot/Assets/de.lproj/Bwi.strings
#	Riot/Assets/en.lproj/Bwi.strings
2024-01-25 15:24:03 +01:00
..