summaryrefslogtreecommitdiff
path: root/django/db
diff options
context:
space:
mode:
authorJoseph Kocherhans <joseph@jkocherhans.com>2010-02-23 00:08:03 +0000
committerJoseph Kocherhans <joseph@jkocherhans.com>2010-02-23 00:08:03 +0000
commit16efc1a92e30e5f8a9ecc89edf0002db2425b3b4 (patch)
tree27f1d2f042771ef169c89acd47695018e47aae4d /django/db
parentbd79677e2999b545c27be8b2696c7f176ad78001 (diff)
[1.1.X] Fixed #12820. Implemented other dict methods for MergeDict. Backport of [12498] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12501 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db')
0 files changed, 0 insertions, 0 deletions