summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2010-02-22 23:38:18 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2010-02-22 23:38:18 +0000
commitb3d20ade47aadce5bd02ff33ea7dc0e19cf004cb (patch)
tree2fed7947493acecbd875527f7519f4df694da5f4 /AUTHORS
parent49d6a82261feda6ee1bf23bb17184e932e232172 (diff)
Fixed #12820. Implemented other dict methods for MergeDict. Thanks, Gisle Aas.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12498 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'AUTHORS')
-rw-r--r--AUTHORS1
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS
index 119bb8b20a..92b1559042 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -26,6 +26,7 @@ And here is an inevitably incomplete list of MUCH-APPRECIATED CONTRIBUTORS --
people who have submitted patches, reported bugs, added translations, helped
answer newbie questions, and generally made Django that much better:
+ Gisle Aas <gisle@aas.no>
ajs <adi@sieker.info>
alang@bright-green.com
Alcides Fonseca