mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-09 07:10:34 +02:00
Merge branch 'master' of https://github.com/Detector1/MediaBrowser
Conflicts: CONTRIBUTORS.md
This commit is contained in:
commit
bbec002350
|
@ -54,3 +54,4 @@
|
||||||
- [danlotfy] (https://github.com/danlotfy)
|
- [danlotfy] (https://github.com/danlotfy)
|
||||||
- [jordy1955] (https://github.com/jordy1955)
|
- [jordy1955] (https://github.com/jordy1955)
|
||||||
- [JoshFink] (https://github.com/JoshFink)
|
- [JoshFink] (https://github.com/JoshFink)
|
||||||
|
- [Detector1](https://github.com/Detector1)
|
||||||
|
|
Loading…
Reference in a new issue