Merge branch 'develop' into 'feature/5410_federation_us15_room_settings'

# Conflicts:
#   bwi/Federation/MXRoom+Federation.swift
This commit is contained in:
JanNiklas Grabowski
2024-01-11 11:57:57 +00:00
68 changed files with 824 additions and 265 deletions

View File

@@ -23,7 +23,6 @@
// MARK: - Location Sharing
"location_sharing_copyright_label" = "";
"location_sharing_map_credits_title" = "Mapbox Maps SDK für iOS";
// MARK: - Server Downtime