mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-11-04 03:27:21 -05:00 
			
		
		
		
	Fix merge
This commit is contained in:
		
							parent
							
								
									3abf870c1e
								
							
						
					
					
						commit
						a10aec6956
					
				@ -294,7 +294,7 @@ namespace Jellyfin.Server
 | 
				
			|||||||
                        {
 | 
					                        {
 | 
				
			||||||
                            _logger.LogInformation("Kestrel listening on {IpAddress}", address);
 | 
					                            _logger.LogInformation("Kestrel listening on {IpAddress}", address);
 | 
				
			||||||
                            options.Listen(address, appHost.HttpPort);
 | 
					                            options.Listen(address, appHost.HttpPort);
 | 
				
			||||||
                            if (appHost.ListenWithHttps && appHost.Certificate != null)
 | 
					                            if (appHost.ListenWithHttps)
 | 
				
			||||||
                            {
 | 
					                            {
 | 
				
			||||||
                                options.Listen(address, appHost.HttpsPort, listenOptions =>
 | 
					                                options.Listen(address, appHost.HttpsPort, listenOptions =>
 | 
				
			||||||
                                {
 | 
					                                {
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user