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

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-25 11:16:31 -04:00
commit 70844a3b34
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.md
View File

@ -36,3 +36,4 @@
- [milli260876](https://github.com/milli260876) - [milli260876](https://github.com/milli260876)
- [vileboy] (https://github.com/vileboy) - [vileboy] (https://github.com/vileboy)
- [starkadius] (https://github.com/starkadius) - [starkadius] (https://github.com/starkadius)
- [wraslor](https://github.com/wraslor)