mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-07-09 03:04:24 -04:00
Merge branch 'master' of https://github.com/yardameus/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
98169502d1
@ -46,3 +46,4 @@
|
||||
- [crisliv / xliv](https://github.com/crisliv)
|
||||
- [Yogi](https://github.com/yogi12)
|
||||
- [madFloyd] (https://github.com/madFloyd)
|
||||
- [yardameus] (https://github.com/yardameus)
|
Loading…
x
Reference in New Issue
Block a user