Merge branch 'master' of https://github.com/Detector1/MediaBrowser · bbec002350 - Gogs

Merge branch 'master' of https://github.com/Detector1/MediaBrowser

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti 11 年之前

父节点

a5fa31cf94 27aba90946

当前提交

bbec002350

共有 1 个文件被更改，包括 1 次插入 和 0 次删除

分列视图显示文件统计

						
							+ 1
							
							- 0
						
CONTRIBUTORS.md
							 
								查看文件
							
				@@ -54,3 +54,4 @@
			
				  - [danlotfy] (https://github.com/danlotfy)
			
				  - [jordy1955] (https://github.com/jordy1955)
			
				  - [JoshFink] (https://github.com/JoshFink)
			
				+ - [Detector1](https://github.com/Detector1)