1
0
mirror of https://github.com/django/django.git synced 2025-10-14 09:19:10 +00:00

2 Commits

Author SHA1 Message Date
Alex Gaynor
4e25ca00c8 [soc2009/multidb] Merged up to trunk r11864.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-14 17:47:04 +00:00
Malcolm Tredinnick
67373009e0 Fixed #4563 -- Context.pop/push/update return the top-level dictionary (the new
one for push() and update(), the one removed for pop()). Based on a patch from
Brian Harring.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6854 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2007-12-02 23:57:22 +00:00