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

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-24 12:47:51 -04:00
commit a5bdf11991
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

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