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

Explorar el Código

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

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti hace 12 años

padre

fa6de05d3f b9dfe3010a

commit

1a6065d2cb

Se han modificado 1 ficheros con 1 adiciones y 0 borrados

Dividir vista Mostrar estadísticas de diff

						
							+ 1
							
							- 0
						
CONTRIBUTORS.md
							 
								Ver fichero
							
				@@ -31,3 +31,4 @@
			
				  - [RedshirtMB](https://github.com/RedshirtMB)
			
				  - [thealienamongus](https://github.com/thealienamongus)
			
				  - [brocass](https://github.com/brocass)
			
				+ - [pjrollo2000](https://github.com/pjrollo2000)