Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-23 23:48:27 -04:00
commit 19e04cdfaf
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

@ -26,4 +26,5 @@
- [doron1] (https://github.com/doron1) - [doron1] (https://github.com/doron1)
- [brainfryd] (https://github.com/brainfryd) - [brainfryd] (https://github.com/brainfryd)
- [DGMayor] (http://github.com/DGMayor) - [DGMayor] (http://github.com/DGMayor)
- [Jon-theHTPC] (https://github.com/Jon-theHTPC) - [Jon-theHTPC] (https://github.com/Jon-theHTPC)
- [aspdend] (https://github.com/aspdend)