summaryrefslogtreecommitdiff
path: root/docs/internals/committers.txt
diff options
context:
space:
mode:
authorAndrew Godwin <andrew@aeracode.org>2012-08-10 12:40:37 +0100
committerAndrew Godwin <andrew@aeracode.org>2012-08-10 12:40:37 +0100
commit184cf9ab798d5b25d855649ddb2ca580949778df (patch)
tree8512633ec04a6979b0953e32e73c9a43d09e5805 /docs/internals/committers.txt
parentc4b2a3262cc79383d6562cfc7e9af20135c8e0bf (diff)
parent7275576235ae2e87f3de7b0facb3f9b0a2368f28 (diff)
Merge branch 'master' into schema-alteration
Diffstat (limited to 'docs/internals/committers.txt')
-rw-r--r--docs/internals/committers.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index fb601a24c0..5567c26fa1 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -149,6 +149,7 @@ Joseph Kocherhans
.. _brian rosner: http://brosner.com/
.. _eldarion: http://eldarion.com/
.. _django dose: http://djangodose.com/
+.. _pinax: http://pinaxproject.com/
`Gary Wilson`_
Gary starting contributing patches to Django in 2006 while developing Web
@@ -174,7 +175,7 @@ Justin Bronn
implementing GeoDjango, Justin obtained a deep knowledge of Django's
internals including the ORM, the admin, and Oracle support.
- Justin lives in Houston, Texas.
+ Justin lives in San Francisco, CA.
.. _GeoDjango: http://geodjango.org/