mirror of
				https://github.com/jellyfin/jellyfin.git
				synced 2025-10-31 10:37:22 -04:00 
			
		
		
		
	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
This commit is contained in:
		
						commit
						00d24d6676
					
				| @ -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")] | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user