Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser · 1a6065d2cb - Gogs

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

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti 12 years ago

parent

fa6de05d3f b9dfe3010a

commit

1a6065d2cb

1 changed files with 1 additions and 0 deletions

Unified View Show Diff Stats

						
							+ 1
							
							- 0
						
CONTRIBUTORS.md
							 
								View File
							
															@@ -31,3 +31,4 @@
														
															  - [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)
														
															  - [brocass](https://github.com/brocass)
														
															+ - [pjrollo2000](https://github.com/pjrollo2000)