cotugno/jellyfin

mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 09:59:06 -07:00

Luke Pulverenti 5850c7067d Merge branch 'master' of https://github.com/Jon-theHTPC/MediaBrowser

Conflicts:
	CONTRIBUTORS.md

2013-08-23 23:46:59 -04:00

1.2 KiB

Raw Blame History

Contributors

LukePulverenti
ebr11
lalmanzar
schneifu
Mark2xv
ScottRapsey
skynet600
Cheesegeezer
Radeon
gcw07
SivaramAdhiappan
CWatkinsNash
sfnetwork
[Logos302] (https://github.com/Logos302)
TheWorkz
mboehler
KaHooli
xzener
[CBers] (https://github.com/CBers)
[Sagaia] (https://github.com/Sagaia)
JHawk111
David3663
Smyken
[doron1] (https://github.com/doron1)
[brainfryd] (https://github.com/brainfryd)
[DGMayor] (http://github.com/DGMayor)
[Jon-theHTPC] (https://github.com/Jon-theHTPC)