Merge branch 'beta' into dev · 00d24d6676 - Gogs

Merge branch 'beta' into dev

Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/.bower.json
	MediaBrowser.WebDashboard/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js

Luke Pulverenti 9 years ago

parent

7236ce0f92 3925a7ca5f

commit

00d24d6676

1 changed files with 2 additions and 2 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 2
						
SharedVersion.cs
							 
								View File
							
				@@ -1,4 +1,4 @@
			
				 ﻿using System.Reflection;
			
				-[assembly: AssemblyVersion("3.0.*")]
			
				-//[assembly: AssemblyVersion("3.0.5806")]
			
				+//[assembly: AssemblyVersion("3.0.*")]
			
				+[assembly: AssemblyVersion("3.0.5865")]