Skip to content

Commit

Permalink
Merge branch 'release/v1.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
twidi committed Nov 3, 2016
2 parents af5b707 + 87c70d4 commit 29ed4d2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

Release *v1.1.1* - ``2016-11-03``
---------------------------------
* make ``OrderedChoices`` available at the package root

Release *v1.1* - ``2016-11-03``
-------------------------------
* add the ``extract_subset`` method
Expand Down
4 changes: 2 additions & 2 deletions extended_choices/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

from __future__ import unicode_literals

from .choices import Choices
from .choices import Choices, OrderedChoices

__author__ = 'Stephane "Twidi" Ange;'
__contact__ = "[email protected]"
__homepage__ = "https://pypi.python.org/pypi/django-extended-choices"
__version__ = "1.1"
__version__ = "1.1.1"
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def read_relative_file(filename):

setup(
name="django-extended-choices",
version="1.1",
version="1.1.1",
license="BSD",
description="Little helper application to improve django choices"
"(for fields)",
Expand Down

0 comments on commit 29ed4d2

Please sign in to comment.