diff options
| author | Rouli <rouli.net@gmail.com> | 2013-03-18 14:24:13 +0200 |
|---|---|---|
| committer | Rouli <rouli.net@gmail.com> | 2013-03-18 14:24:13 +0200 |
| commit | c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f (patch) | |
| tree | 1e62785d669d86f6e551a99b9debfe445389bd48 /CONTRIBUTORS | |
| parent | b6cae7cd2d0105d6a6fe9d35864d0f9b7c5f8924 (diff) | |
| parent | 5c33f6784b4ba34dd9825ea7e3070cdf0b2b4621 (diff) | |
| download | mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.tar.gz mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.tar.bz2 mitmproxy-c94aadcb0ee5e7aab8acc46a0e4ac7d02a28df6f.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'CONTRIBUTORS')
| -rw-r--r-- | CONTRIBUTORS | 50 |
1 files changed, 32 insertions, 18 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5c644fe0..5c98705a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,18 +1,32 @@ - 485 Aldo Cortesi - 18 Henrik Nordstrom - 13 Thomas Roth - 11 Stephen Altamirano - 6 András Veres-Szentkirályi - 4 Valtteri Virtanen - 2 alts - 2 Michael Frister - 2 Mark E. Haase - 2 Heikki Hannikainen - 1 meeee - 1 capt8bit - 1 Yuangxuan Wang - 1 Ulrich Petri - 1 Rune Halvorsen - 1 Rory McCann - 1 Henrik Nordström - 1 Felix Wolfsteller + 730 Aldo Cortesi + 18 Henrik Nordstrom + 13 Thomas Roth + 11 Stephen Altamirano + 10 András Veres-Szentkirályi + 6 Alexis Hildebrandt + 4 Maximilian Hils + 4 Bryan Bishop + 4 Valtteri Virtanen + 4 Rouli + 3 Chris Neasbitt + 2 Rob Wills + 2 Jim Lloyd + 2 alts + 2 Mark E. Haase + 2 israel + 2 Michael Frister + 2 Heikki Hannikainen + 1 phil plante + 1 Andy Smith + 1 Felix Wolfsteller + 1 Henrik Nordström + 1 Jakub Nawalaniec + 1 Mathieu Mitchell + 1 Paul + 1 Rory McCann + 1 Rune Halvorsen + 1 Sahn Lam + 1 Ulrich Petri + 1 Yuangxuan Wang + 1 capt8bit + 1 meeee |