mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-08 18:54:26 -04:00
Merge branch 'master' of https://github.com/crisliv/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
d83055e4ee
@ -43,3 +43,4 @@
|
|||||||
- [0sm0] (https://github.com/0sm0)
|
- [0sm0] (https://github.com/0sm0)
|
||||||
- [swhitmore](https://github.com/swhitmore)
|
- [swhitmore](https://github.com/swhitmore)
|
||||||
- [DigiTM](https://github.com/DigiTM)
|
- [DigiTM](https://github.com/DigiTM)
|
||||||
|
- [crisliv / xliv](https://github.com/crisliv)
|
Loading…
x
Reference in New Issue
Block a user