Merge release branch 'v1.8_relay_fix_and_video_player'

Manually fixed simple merge conflict in damus.xcodeproj/project.pbxproj
This commit is contained in:
Daniel D’Aquino
2024-05-03 12:36:58 -07:00

View File

@@ -58,7 +58,7 @@ func load_bootstrap_relays(pubkey: Pubkey) -> [RelayURL] {
let relay_urls = relays.compactMap({ RelayURL($0) })
let loaded_relays = Array(Set(relay_urls + get_default_bootstrap_relays()))
let loaded_relays = Array(Set(relay_urls))
print("Loading custom bootstrap relays: \(loaded_relays)")
return loaded_relays
}