starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-05 00:31:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti
2013-08-27 22:46:42 -04:00
parent 13198a687d 5f745613b4
commit d83055e4ee
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

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