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

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti 2013-08-26 11:17:48 -04:00
commit 779bc6baf5
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

@ -40,4 +40,5 @@
- [mrwebsmith](https://github.com/mrwebsmith)
- [rickster53](https://github.com/rickster53)
- [Tharnax] (https://github.com/Tharnax)
- [0sm0] (https://github.com/0sm0)
- [0sm0] (https://github.com/0sm0)
- [swhitmore](https://github.com/swhitmore)