diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-08-17 13:30:36 +0200 |
| commit | 729677cd85cffedec8f481f1b6025f00fb637e13 (patch) | |
| tree | 39c245643c5a3a48bd14c6e13757148bda54e2f3 /CONTRIBUTORS | |
| parent | 6fe175913e611097fdfdf0a6b20b1c05909374e1 (diff) | |
| parent | a558c016d4430b67d221a369abe0cde1f4a40fce (diff) | |
| download | mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.gz mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.tar.bz2 mitmproxy-729677cd85cffedec8f481f1b6025f00fb637e13.zip | |
Merge branch 'master' into 0.10
Diffstat (limited to 'CONTRIBUTORS')
| -rw-r--r-- | CONTRIBUTORS | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 37d0ce1e..e7ea1fb7 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,35 +1,39 @@ - 759 Aldo Cortesi + 777 Aldo Cortesi 18 Henrik Nordstrom 13 Thomas Roth 11 Stephen Altamirano 10 András Veres-Szentkirályi 8 Rouli + 8 Jason A. Novak 7 Alexis Hildebrandt - 5 Maximilian Hils - 4 Bryan Bishop + 6 Maximilian Hils 4 Valtteri Virtanen + 4 Bryan Bishop 3 Chris Neasbitt - 2 Michael Frister 2 Heikki Hannikainen 2 Jim Lloyd 2 Mark E. Haase + 2 Michael Frister 2 Rob Wills 2 alts 2 israel - 1 Jakub Nawalaniec + 1 Mathieu Mitchell + 1 Michael Bisbjerg + 1 capt8bit + 1 Nicolas Esteves 1 Paul 1 phil plante 1 Rory McCann - 1 Henrik Nordström + 1 Jakub Nawalaniec 1 Rune Halvorsen 1 Sahn Lam - 1 Felix Wolfsteller - 1 Eric Entzel - 1 Ulrich Petri + 1 Ivaylo Popov 1 Andy Smith + 1 Ulrich Petri + 1 Henrik Nordström + 1 Felix Wolfsteller 1 Yuangxuan Wang + 1 Kit Randel + 1 Marc Liyanage 1 meeee - 1 capt8bit - 1 Mathieu Mitchell - 1 Jason A. Novak - 1 Nicolas Esteves + 1 Eric Entzel |