pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-25 11:16:31 -04:00
parent 716227fd59 8cb4bf9df8
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

3
CONTRIBUTORS.md
View File

@ -35,4 +35,5 @@
- [abobader](https://github.com/abobader)
- [milli260876](https://github.com/milli260876)
- [vileboy] (https://github.com/vileboy)
- [starkadius] (https://github.com/starkadius)
- [starkadius] (https://github.com/starkadius)
- [wraslor](https://github.com/wraslor)