Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
1a6065d2cb
|
@ -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)
|
Loading…
Reference in New Issue
Block a user