mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Merge branch 'allow-any-iterable-for-choices'

Browse Source
This commit is contained in:
Donald Stufft
2013-05-18 11:31:16 -04:00
parent 78de9b1902 a19e9d80ff
commit 398841d6d3
7 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/releases/1.6.txt
View File

@@ -238,6 +238,9 @@ Minor features
Meta option: ``localized_fields``. Fields included in this list will be localized
(by setting ``localize`` on the form field).
* The ``choices`` argument to model fields now accepts an iterable of iterables
instead of requiring an iterable of lists or tuples.
Backwards incompatible changes in 1.6
=====================================