CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-09-29 02:47:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

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

Browse source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-27 11:15:36 -04:00
commit bf4ee62157
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CONTRIBUTORS.md
View file

@ -41,4 +41,5 @@
- [rickster53](https://github.com/rickster53)
- [Tharnax] (https://github.com/Tharnax)
- [0sm0] (https://github.com/0sm0)
- [swhitmore](https://github.com/swhitmore)
- [swhitmore](https://github.com/swhitmore)
- [DigiTM](https://github.com/DigiTM)