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

Explorar o código

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

Conflicts:
	CONTRIBUTORS.md

Luke Pulverenti %!s(int64=12) %!d(string=hai) anos

pai

79a82ae671 dac3de818f

achega

fa6de05d3f

Modificáronse 1 ficheiros con 1 adicións e 0 borrados

Dividir vista Mostrar estatísticas de Diff

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