Merge branch 'release-2.0' into develop
This commit is contained in:
commit
bce1101458
@ -17,7 +17,7 @@ Feature release.
|
||||
(Fixes: :issue:`1133`, :issue:`1516`, PR: :issue:`1523`)
|
||||
|
||||
|
||||
v2.0.1 (UNRELEASED)
|
||||
v2.0.1 (2016-08-16)
|
||||
===================
|
||||
|
||||
Bug fix release.
|
||||
|
||||
@ -13,8 +13,7 @@ Creating releases
|
||||
|
||||
#. Update changelog and commit it.
|
||||
|
||||
#. Bump the version number in ``mopidy/__init__.py``. Remember to update the
|
||||
test case in ``tests/test_version.py``.
|
||||
#. Bump the version number in ``mopidy/__init__.py``.
|
||||
|
||||
#. Merge the release branch (``develop`` in the example) into master::
|
||||
|
||||
|
||||
@ -14,4 +14,4 @@ if not (2, 7) <= sys.version_info < (3,):
|
||||
warnings.filterwarnings('ignore', 'could not open display')
|
||||
|
||||
|
||||
__version__ = '2.0.0'
|
||||
__version__ = '2.0.1'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user