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

Conflicts: CONTRIBUTORS.md
12 years ago · 1a6065d2cb
parent fa6de05d3f b9dfe3010a
commit 1a6065d2cb
1 changed files with 1 additions and 0 deletions
--- a/CONTRIBUTORS.md
+++ b/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)