fix merge conflict · 75f58d5665 - jellyfin - Cloudchain Git

Your ROOT_URL in app.ini is https://git.cloudchain.link/ but you are visiting https://dash.bss.nz/open-source-mirrors/jellyfin/commit/75f58d5665322a5045649aed89aecfef011b315c You should set ROOT_URL correctly, otherwise the web may not work correctly.

fix merge conflict

release-10.1.0

Luke Pulverenti

parent 04dc04298b

commit 75f58d5665

1 changed files with 1 additions and 1 deletions

										
											2

SharedVersion.cs

										Unescape
										Escape
									
											View File
										
					@ -1,3 +1,3 @@

					﻿using System.Reflection;

					[assembly: AssemblyVersion("3.2.8")]

					[assembly: AssemblyVersion("3.2.8.16")]