diff options
| author | Andrew Godwin <andrew@aeracode.org> | 2013-06-19 12:03:20 +0100 |
|---|---|---|
| committer | Andrew Godwin <andrew@aeracode.org> | 2013-06-19 12:05:23 +0100 |
| commit | 9daf81b94e7945d7adfdf62206cf9cb436166f0d (patch) | |
| tree | 0ca2a77977432d0c139886297afb433569b588ca /docs/internals | |
| parent | 315ab41e416c777d4f42932d42df07872e8f8895 (diff) | |
| parent | d9a43545be1af95a13c181c8b178f5631d3a4148 (diff) | |
Merge remote-tracking branch 'core/master' into schema-alteration
Conflicts:
django/db/models/loading.py
Diffstat (limited to 'docs/internals')
| -rw-r--r-- | docs/internals/committers.txt | 11 | ||||
| -rw-r--r-- | docs/internals/contributing/writing-code/submitting-patches.txt | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt index b56c8e469b..6732f1561f 100644 --- a/docs/internals/committers.txt +++ b/docs/internals/committers.txt @@ -526,6 +526,17 @@ Marc Tamlyn .. _CCBV: http://ccbv.co.uk/ .. _Incuna Ltd: http://incuna.com/ +Baptiste Mispelon + Baptiste discovered Django around the 1.2 version and promptly switched away + from his homegrown PHP framework. He started getting more involved in the + project after attending DjangoCon EU 2012, mostly by triaging tickets and + submitting small patches. + + Baptiste currently lives in Budapest, Hungary and works for `M2BPO`_, + a small French company providing services to architects. + +.. _M2BPO: http://www.m2bpo.fr + Developers Emeritus =================== diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt index ed8aad99b3..8f8ddddab4 100644 --- a/docs/internals/contributing/writing-code/submitting-patches.txt +++ b/docs/internals/contributing/writing-code/submitting-patches.txt @@ -37,7 +37,7 @@ and time availability), claim it by following these steps: `ticket tracker`_. * If a ticket for this issue already exists, make sure nobody else has - claimed it. To do this, look at the "Assigned to" section of the ticket. + claimed it. To do this, look at the "Owned by" section of the ticket. If it's assigned to "nobody," then it's available to be claimed. Otherwise, somebody else is working on this ticket, and you either find another bug/feature to work on, or contact the developer working on the @@ -48,7 +48,7 @@ and time availability), claim it by following these steps: * Claim the ticket: - 1. click the "accept" radio button under "Action" near the bottom of the + 1. click the "assign to myself" radio button under "Action" near the bottom of the page, 2. then click "Submit changes." |