michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-25 11:15:29 -04:00
commit 716227fd59
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

@ -35,3 +35,4 @@
- [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) - [vileboy] (https://github.com/vileboy)
- [starkadius] (https://github.com/starkadius)