starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-02-05 00:31:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	CONTRIBUTORS.md
This commit is contained in:
Luke Pulverenti
2013-08-24 09:13:17 -04:00
parent 1a6065d2cb b37d75dca4
commit e51b577732
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS.md
View File

@@ -31,4 +31,5 @@
- [RedshirtMB](https://github.com/RedshirtMB)
- [thealienamongus](https://github.com/thealienamongus)
- [brocass](https://github.com/brocass)
- [pjrollo2000](https://github.com/pjrollo2000)
- [pjrollo2000](https://github.com/pjrollo2000)
- [abobader](https://github.com/abobader)