summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Tamlyn <marc.tamlyn@gmail.com>2013-05-17 15:51:13 +0200
committerMarc Tamlyn <marc.tamlyn@gmail.com>2013-05-17 17:24:17 +0200
commit31d98d4ab55f44b5c3c446c2c51df6490ed6c0d0 (patch)
treecccf4f7639b1ed72ed7c009b50586c58638327e9
parent10e397e2631f8b4c3be486dfc922a91c4512684d (diff)
Added myself to committers.
-rw-r--r--AUTHORS2
-rw-r--r--docs/internals/committers.txt11
2 files changed, 12 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index fb084f26cb..973e32d05a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ The PRIMARY AUTHORS are (and/or have been):
* Preston Holmes
* Simon Charette
* Donald Stufft
+ * Marc Tamlyn
More information on the main contributors to Django can be found in
docs/internals/committers.txt.
@@ -540,7 +541,6 @@ answer newbie questions, and generally made Django that much better:
Aaron Swartz <http://www.aaronsw.com/>
Ville Säävuori <http://www.unessa.net/>
Mart Sõmermaa <http://mrts.pri.ee/>
- Marc Tamlyn
Christian Tanzer <tanzer@swing.co.at>
Tyler Tarabula <tyler.tarabula@gmail.com>
Tyson Tate <tyson@fallingbullets.com>
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 06562ca777..ff2721bca9 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -503,6 +503,17 @@ Tim Graham
Tim works as a software engineer and lives in Philadelphia, PA, USA.
+Marc Tamlyn
+ Marc started life on the web using Django 1.2 back in 2010, and has never
+ looked back. He was involved with rewriting the class based view
+ documentation at DjangoCon EU 2012, and also helped to develop `CCBV`_, an
+ additional class based view reference tool.
+
+ Marc currently works at Incuna Ltd, a digital healthcare agency in Oxford,
+ UK.
+
+.. _CCBV: http://ccbv.co.uk/
+
Developers Emeritus
===================