Stepan Goremykin 8d7e4229ca Merge branch 'master' into fix-resharper-warnings ... # Conflicts: # Emby.Server.Implementations/Net/SocketFactory.cs # RSSDP/SsdpCommunicationsServer.cs # RSSDP/SsdpDeviceLocator.cs # RSSDP/SsdpDevicePublisher.cs		2023-10-12 20:11:16 +02:00
..
UdpServer.cs	Merge branch 'master' into fix-resharper-warnings	2023-10-12 20:11:16 +02:00