Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into fix-default-plural
Browse files Browse the repository at this point in the history
  • Loading branch information
thefunny42 committed Oct 24, 2018
2 parents bbd6adf + 1ac9750 commit d46570d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
10 changes: 8 additions & 2 deletions CHANGES.rst
Expand Up @@ -2,8 +2,14 @@
CHANGES
=========

4.6 (unreleased)
================
4.6.1 (unreleased)
==================

- Nothing changed yet.


4.6.0 (2018-10-22)
==================

- Use ``msgid_plural`` as ``default_plural`` if not provided in
``translate()``.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -59,7 +59,7 @@ def alltests():

setup(
name='zope.i18n',
version='4.6.dev0',
version='4.6.1.dev0',
author='Zope Foundation and Contributors',
author_email='zope-dev@zope.org',
description='Zope Internationalization Support',
Expand Down

0 comments on commit d46570d

Please sign in to comment.