pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix merge conflict

This commit is contained in:
Luke Pulverenti 2016-12-21 15:24:20 -05:00
parent 70f48f9cea
commit f54ed74837
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.1.*")]
[assembly: AssemblyVersion("3.1.0")]
[assembly: AssemblyVersion("3.1.260")]