mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
Merge branch 'master' of https://github.com/RedshirtMB/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
def2b00c98
@ -27,4 +27,5 @@
|
|||||||
- [brainfryd] (https://github.com/brainfryd)
|
- [brainfryd] (https://github.com/brainfryd)
|
||||||
- [DGMayor] (http://github.com/DGMayor)
|
- [DGMayor] (http://github.com/DGMayor)
|
||||||
- [Jon-theHTPC] (https://github.com/Jon-theHTPC)
|
- [Jon-theHTPC] (https://github.com/Jon-theHTPC)
|
||||||
- [aspdend] (https://github.com/aspdend)
|
- [aspdend] (https://github.com/aspdend)
|
||||||
|
- [RedshirtMB](https://github.com/RedshirtMB)
|
Loading…
x
Reference in New Issue
Block a user