Commit graph

115 commits

Author SHA1 Message Date
Luke Pulverenti
76529eec83 Merge branch 'master' of https://github.com/madFloyd/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-28 07:42:39 -04:00
Luke Pulverenti
b19d0a14d3 Merge branch 'master' of https://github.com/Yogi12/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-27 22:47:55 -04:00
Luke Pulverenti
d83055e4ee Merge branch 'master' of https://github.com/crisliv/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-27 22:46:42 -04:00
Luke Pulverenti
bf4ee62157 Merge branch 'master' of https://github.com/DigiTM/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-27 11:15:36 -04:00
Luke Pulverenti
779bc6baf5 Merge branch 'master' of https://github.com/swhitmore/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-26 11:17:48 -04:00
Luke Pulverenti
055515d221 Merge branch 'master' of https://github.com/0sm0/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-26 08:10:13 -04:00
Luke Pulverenti
f9e84e5c2a Merge branch 'master' of https://github.com/Tharnax/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-26 08:09:29 -04:00
rickster53
a8a97ca96c Update CONTRIBUTORS.md
adding rickster53
2013-08-26 07:20:16 -04:00
mrwebsmith
80bbe4e61b Update CONTRIBUTORS.md 2013-08-25 12:39:38 -04:00
Luke Pulverenti
70844a3b34 Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-25 11:16:31 -04:00
Luke Pulverenti
716227fd59 Merge branch 'master' of https://github.com/starkadius/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-25 11:15:29 -04:00
wraslor
a9434a6082 Update CONTRIBUTORS.md 2013-08-24 15:37:21 -04:00
Luke Pulverenti
a5bdf11991 Merge branch 'master' of https://github.com/vileboy/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-24 12:47:51 -04:00
Luke Pulverenti
5d2dc5bd10 Merge branch 'master' of https://github.com/milli260876/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-24 09:14:13 -04:00
Luke Pulverenti
e51b577732 Merge branch 'master' of https://github.com/abobader/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-24 09:13:17 -04:00
Luke Pulverenti
1a6065d2cb Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-24 09:10:36 -04:00
Luke Pulverenti
fa6de05d3f Merge branch 'master' of https://github.com/brocass/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-24 09:09:58 -04:00
pjrollo2000
66194b1df0 Update CONTRIBUTORS.md 2013-08-24 12:28:43 +01:00
thealienamongus
95f1204e86 Update CONTRIBUTORS.md 2013-08-24 14:06:21 +10:00
Luke Pulverenti
def2b00c98 Merge branch 'master' of https://github.com/RedshirtMB/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-23 23:49:38 -04:00
Luke Pulverenti
19e04cdfaf Merge branch 'master' of https://github.com/aspdend/MediaBrowser
Conflicts:
	CONTRIBUTORS.md
2013-08-23 23:48:27 -04: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
DGMayor
30243795a4 Update CONTRIBUTORS.md 2013-08-23 11:21:26 -04:00
Yogi12
bbd0f31ea1 Update CONTRIBUTORS.md 2013-08-24 01:05:13 +10:00
Detector1
27aba90946 Update CONTRIBUTORS.md 2013-08-23 09:58:22 -04:00
brainfryd
0825bf1665 Update CONTRIBUTORS.md 2013-08-23 23:52:55 +10:00
doron1
d6f6ddbd7a Update CONTRIBUTORS.md 2013-08-23 16:10:13 +03:00
crisliv
5f745613b4 Update CONTRIBUTORS.md 2013-08-23 13:54:35 +02:00
crisliv
e1eca89f1d Update CONTRIBUTORS.md 2013-08-23 13:54:10 +02:00
crisliv
dc2b2d1204 Added contributor 2013-08-23 13:53:50 +02:00
DigiTM
897c9ce2cb Update CONTRIBUTORS.md 2013-08-23 19:07:51 +10:00
Smyken
37325ba0bf Update CONTRIBUTORS.md 2013-08-23 09:59:16 +02:00
david3663
ad336d25ce Update CONTRIBUTORS.md
Added myself :)
2013-08-22 22:45:10 -04:00
JHawk111
fd35504bf0 Update CONTRIBUTORS.md 2013-08-22 22:35:35 -04:00
Sagaia
486f0265ef Update CONTRIBUTORS.md 2013-08-22 21:00:29 -04:00
Scott Whitmore
80d88ecf60 Update CONTRIBUTORS.md 2013-08-23 08:06:08 +08:00
yardameus
ed05a0ca78 Update CONTRIBUTORS.md 2013-08-22 19:06:01 -05:00
Tim
0c3898e9ed Update CONTRIBUTORS.md 2013-08-23 08:58:20 +09:30
CBers
b0970e85bf Update CONTRIBUTORS.md 2013-08-22 23:53:30 +01:00
xzener
c8b0136979 Update CONTRIBUTORS.md 2013-08-22 14:53:34 -07:00
KaHooli
26028cda34 Update CONTRIBUTORS.md
Adding myself as requested at http://community.mediabrowser.tv/permalinks/14864/mark-yourself-as-a-contributor due to helping with reporting issues with beta.
2013-08-23 05:50:31 +10:00
Tharnax
59010fb98a Update CONTRIBUTORS.md 2013-08-22 15:42:59 -04:00
starkadius
a9b097f59b Update CONTRIBUTORS.md 2013-08-22 11:04:39 -07:00
vileboy
99911649c2 Update CONTRIBUTORS.md 2013-08-22 19:04:20 +01:00
madFloyd
6b9d68d54d Update CONTRIBUTORS.md 2013-08-22 13:51:00 -04:00
mboehler
746b203e46 Update CONTRIBUTORS.md 2013-08-22 12:20:49 -05:00
Luke
2bd212f934 Merge pull request #449 from sfnetwork/master
Update CONTRIBUTORS.md
2013-08-22 09:59:47 -07:00
TheWorkz
29d6f002cd Update CONTRIBUTORS.md 2013-08-22 09:52:15 -07:00
sfnetwork
54d8f37438 Update CONTRIBUTORS.md 2013-08-22 12:47:44 -04:00
Logos302
68d27df20a Update CONTRIBUTORS.md 2013-08-22 09:20:41 -07:00
CWatkinsNash
2fa2ed0ee5 Update CONTRIBUTORS.md 2013-08-22 11:00:53 -05:00
brocass
dac3de818f Update CONTRIBUTORS.md 2013-08-22 16:51:39 +01:00
milli260876
ccdc6a64b7 Update CONTRIBUTORS.md 2013-08-22 16:37:23 +01:00
Sivaram Adhiappan
811c923709 Update CONTRIBUTORS.md 2013-08-22 10:34:48 -05:00
Sivaram Adhiappan
fd6646b8b8 Update CONTRIBUTORS.md
Added my name to Contributors
2013-08-22 10:34:13 -05:00
Grant
e04b657196 Update CONTRIBUTORS.md 2013-08-22 09:55:46 -05:00
brocass
f5d0615152 Update CONTRIBUTORS.md 2013-08-22 15:55:42 +01:00
abobader
b37d75dca4 Update CONTRIBUTORS.md 2013-08-22 17:53:00 +03:00
Mark
dd64d54ca1 Update CONTRIBUTORS.md 2013-08-22 07:29:21 -07:00
radeonorama
d19e56eb74 Update CONTRIBUTORS.md 2013-08-22 15:29:02 +01:00
Cheesegeezer
99910c9dfa Update CONTRIBUTORS.md 2013-08-22 15:24:16 +01:00
Jon
5c0a8e31a4 Update CONTRIBUTORS.md 2013-08-22 10:20:03 -04:00
aspdend
096034179e Update CONTRIBUTORS.md 2013-08-22 15:19:29 +01:00
skynet600
7c9f6bb40e Update CONTRIBUTORS.md 2013-08-22 15:14:21 +01:00
Luke Pulverenti
2864e3953c added contributors file 2013-08-22 09:59:39 -04:00