aboutsummaryrefslogtreecommitdiffstats
path: root/CONTRIBUTORS
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2012-02-19 22:43:05 +1300
committerAldo Cortesi <aldo@nullcube.com>2012-02-19 22:43:05 +1300
commit0c3035a2b5cbf0bba3185b1ffab3444cd8c20490 (patch)
tree1dc088cf1b981e1084cf53bc55b473461632d7db /CONTRIBUTORS
parent86a19faf6859e1f971ccccba3dabe596531636e9 (diff)
downloadmitmproxy-0c3035a2b5cbf0bba3185b1ffab3444cd8c20490.tar.gz
mitmproxy-0c3035a2b5cbf0bba3185b1ffab3444cd8c20490.tar.bz2
mitmproxy-0c3035a2b5cbf0bba3185b1ffab3444cd8c20490.zip
Start preparing for 0.7
Update CHANGELOG, CONTRIBUTORS, README.mkd, todo, and bump version.
Diffstat (limited to 'CONTRIBUTORS')
-rw-r--r--CONTRIBUTORS21
1 files changed, 13 insertions, 8 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c3f658cc..47787dec 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1,8 +1,13 @@
- 278 Aldo Cortesi
- 18 Henrik Nordstrom
- 13 Thomas Roth
- 10 Stephen Altamirano
- 2 alts
- 1 Yuangxuan Wang
- 1 Henrik Nordström
- 1 Felix Wolfsteller
+ 365 Aldo Cortesi
+ 18 Henrik Nordstrom
+ 13 Thomas Roth
+ 11 Stephen Altamirano
+ 5 András Veres-Szentkirályi
+ 2 alts
+ 2 Mark E. Haase
+ 2 Heikki Hannikainen
+ 1 meeee
+ 1 Yuangxuan Wang
+ 1 Rory McCann
+ 1 Henrik Nordström
+ 1 Felix Wolfsteller