Parcourir la source

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

Conflicts:
	CONTRIBUTORS.md
Luke Pulverenti il y a 12 ans
Parent
commit
1a6065d2cb
1 fichiers modifiés avec 1 ajouts et 0 suppressions
  1. 1 0
      CONTRIBUTORS.md

+ 1 - 0
CONTRIBUTORS.md

@@ -31,3 +31,4 @@
  - [RedshirtMB](https://github.com/RedshirtMB)
  - [thealienamongus](https://github.com/thealienamongus)
  - [brocass](https://github.com/brocass)
+ - [pjrollo2000](https://github.com/pjrollo2000)