fix merge conflict · 6b077f3f84 - 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/6b077f3f8467caa26388a25e6acd1990d286b5d0 You should set ROOT_URL correctly, otherwise the web may not work correctly.

fix merge conflict

release-10.1.0

Luke Pulverenti

parent 77d4791dc2

commit 6b077f3f84

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.27.0")]

					[assembly: AssemblyVersion("3.2.27.3")]