Backup_Repos/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-27 22:43:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Yogi12/MediaBrowser

Browse source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-27 22:47:55 -04:00
commit b19d0a14d3
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CONTRIBUTORS.md
View file

@ -43,4 +43,5 @@
- [0sm0] (https://github.com/0sm0)
- [swhitmore](https://github.com/swhitmore)
- [DigiTM](https://github.com/DigiTM)
- [crisliv / xliv](https://github.com/crisliv)
- [crisliv / xliv](https://github.com/crisliv)
- [Yogi](https://github.com/yogi12)