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

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

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

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