aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTORS
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2013-08-25 10:28:15 +1200
committerAldo Cortesi <aldo@nullcube.com>2013-08-25 10:28:15 +1200
commit789700ade2204570b37c096011bf4ecc0174eb73 (patch)
tree94051c1ec12b643b50ac24ea885852fea9b6a283 /CONTRIBUTORS
parent6a31d3271219dffc9786f08e387ad5dc812fe86c (diff)
downloadmitmproxy-789700ade2204570b37c096011bf4ecc0174eb73.tar.gz
mitmproxy-789700ade2204570b37c096011bf4ecc0174eb73.tar.bz2
mitmproxy-789700ade2204570b37c096011bf4ecc0174eb73.zip
Prep for release: CHANGELOG and CONTRIBUTORS
Diffstat (limited to 'CONTRIBUTORS')
-rw-r--r--CONTRIBUTORS41
1 files changed, 22 insertions, 19 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e7ea1fb7..5ad5d135 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,39 +1,42 @@
- 777 Aldo Cortesi
+ 801 Aldo Cortesi
18 Henrik Nordstrom
13 Thomas Roth
+ 13 Maximilian Hils
11 Stephen Altamirano
10 András Veres-Szentkirályi
- 8 Rouli
8 Jason A. Novak
+ 8 Rouli
7 Alexis Hildebrandt
- 6 Maximilian Hils
+ 4 Marc Liyanage
4 Valtteri Virtanen
4 Bryan Bishop
3 Chris Neasbitt
- 2 Heikki Hannikainen
+ 3 Kyle Manna
2 Jim Lloyd
- 2 Mark E. Haase
+ 2 Matthias Urlichs
2 Michael Frister
- 2 Rob Wills
2 alts
+ 2 Rob Wills
2 israel
- 1 Mathieu Mitchell
- 1 Michael Bisbjerg
- 1 capt8bit
- 1 Nicolas Esteves
+ 2 Mark E. Haase
+ 2 Heikki Hannikainen
+ 1 Oleksandr Sheremet
1 Paul
- 1 phil plante
1 Rory McCann
- 1 Jakub Nawalaniec
1 Rune Halvorsen
1 Sahn Lam
- 1 Ivaylo Popov
- 1 Andy Smith
- 1 Ulrich Petri
- 1 Henrik Nordström
1 Felix Wolfsteller
+ 1 Eric Entzel
+ 1 Ulrich Petri
+ 1 Andy Smith
1 Yuangxuan Wang
- 1 Kit Randel
- 1 Marc Liyanage
+ 1 capt8bit
1 meeee
- 1 Eric Entzel
+ 1 Jakub Nawalaniec
+ 1 Kit Randel
+ 1 phil plante
+ 1 Ivaylo Popov
+ 1 Mathieu Mitchell
+ 1 Henrik Nordström
+ 1 Michael Bisbjerg
+ 1 Nicolas Esteves