Merge branch 'master' of https://github.com/brocass/MediaBrowser · fa6de05d3f - Gogs

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

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti 12 年之前

父节点

79a82ae671 dac3de818f

当前提交

fa6de05d3f

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

合并视图显示文件统计

						
							+ 1
							
							- 0
						
CONTRIBUTORS.md
							 
								查看文件
							
															@@ -30,3 +30,4 @@
														
															  - [aspdend] (https://github.com/aspdend)
														
															  - [aspdend] (https://github.com/aspdend)
														
															  - [RedshirtMB](https://github.com/RedshirtMB)
														
															  - [RedshirtMB](https://github.com/RedshirtMB)
														
															  - [thealienamongus](https://github.com/thealienamongus)
														
															  - [thealienamongus](https://github.com/thealienamongus)
														
															+ - [brocass](https://github.com/brocass)