lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-28 07:42:39 -04:00
commit 76529eec83
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

@ -44,4 +44,5 @@
- [swhitmore](https://github.com/swhitmore)
- [DigiTM](https://github.com/DigiTM)
- [crisliv / xliv](https://github.com/crisliv)
- [Yogi](https://github.com/yogi12)
- [Yogi](https://github.com/yogi12)
- [madFloyd] (https://github.com/madFloyd)