starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-06 09:03:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti
2013-08-25 11:15:29 -04:00
parent a5bdf11991 a9b097f59b
commit 716227fd59
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

@@ -34,4 +34,5 @@
- [pjrollo2000](https://github.com/pjrollo2000)
- [abobader](https://github.com/abobader)
- [milli260876](https://github.com/milli260876)
- [vileboy] (https://github.com/vileboy)
- [vileboy] (https://github.com/vileboy)
- [starkadius] (https://github.com/starkadius)