mirror of https://github.com/jellyfin/jellyfin.git
Merge branch 'master' of https://github.com/brocass/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
fa6de05d3f
|
@ -30,3 +30,4 @@
|
|||
- [aspdend] (https://github.com/aspdend)
|
||||
- [RedshirtMB](https://github.com/RedshirtMB)
|
||||
- [thealienamongus](https://github.com/thealienamongus)
|
||||
- [brocass](https://github.com/brocass)
|
||||
|
|
Loading…
Reference in New Issue