Merge branch 'master' of https://github.com/Jon-theHTPC/MediaBrowser · 5850c7067d - Gogs

Merge branch 'master' of https://github.com/Jon-theHTPC/MediaBrowser

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti 12 年之前

父节点

9e19101f25 5c0a8e31a4

当前提交

5850c7067d

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

合并视图显示文件统计

						
							+ 1
							
							- 0
						
CONTRIBUTORS.md
							 
								查看文件
							
															@@ -26,3 +26,4 @@
														
															  - [doron1] (https://github.com/doron1)
														
															  - [doron1] (https://github.com/doron1)
														
															  - [brainfryd] (https://github.com/brainfryd)
														
															  - [brainfryd] (https://github.com/brainfryd)
														
															  - [DGMayor] (http://github.com/DGMayor)
														
															  - [DGMayor] (http://github.com/DGMayor)
														
															+ - [Jon-theHTPC] (https://github.com/Jon-theHTPC)