mirror of
https://github.com/django/django.git
synced 2025-07-05 10:19:20 +00:00
[soc2009/multidb] Resolved a strange merge conflict.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1a98f6ff26
commit
7cf6fd8d61
@ -177,19 +177,6 @@ Justin Bronn
|
|||||||
|
|
||||||
.. _GeoDjango: http://geodjango.org/
|
.. _GeoDjango: http://geodjango.org/
|
||||||
|
|
||||||
Justin Bronn
|
|
||||||
Justin Bronn is a computer scientist and attorney specializing
|
|
||||||
in legal topics related to intellectual property and spatial law.
|
|
||||||
|
|
||||||
In 2007, Justin began developing ``django.contrib.gis`` in a branch,
|
|
||||||
a.k.a. GeoDjango_, which was merged in time for Django 1.0. While
|
|
||||||
implementing GeoDjango, Justin obtained a deep knowledge of Django's
|
|
||||||
internals including the ORM, the admin, and Oracle support.
|
|
||||||
|
|
||||||
Justin lives in Houston, Texas.
|
|
||||||
|
|
||||||
.. _GeoDjango: http://geodjango.org/
|
|
||||||
|
|
||||||
Karen Tracey
|
Karen Tracey
|
||||||
Karen has a background in distributed operating systems (graduate school),
|
Karen has a background in distributed operating systems (graduate school),
|
||||||
communications software (industry) and crossword puzzle construction
|
communications software (industry) and crossword puzzle construction
|
||||||
|
Loading…
x
Reference in New Issue
Block a user