andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'release-2.0' into develop

Browse Source
This commit is contained in:
Stein Magnus Jodal 2016-08-12 20:59:28 +02:00
commit bce1101458
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/changelog.rst
View File

@ -17,7 +17,7 @@ Feature release.
(Fixes: :issue:`1133`, :issue:`1516`, PR: :issue:`1523`) (Fixes: :issue:`1133`, :issue:`1516`, PR: :issue:`1523`)
v2.0.1 (UNRELEASED) v2.0.1 (2016-08-16)
=================== ===================
Bug fix release. Bug fix release.

3
docs/releasing.rst
View File

@ -13,8 +13,7 @@ Creating releases
#. Update changelog and commit it. #. Update changelog and commit it.
#. Bump the version number in ``mopidy/__init__.py``. Remember to update the #. Bump the version number in ``mopidy/__init__.py``.
test case in ``tests/test_version.py``.
#. Merge the release branch (``develop`` in the example) into master:: #. Merge the release branch (``develop`` in the example) into master::

2
mopidy/__init__.py
View File

@ -14,4 +14,4 @@ if not (2, 7) <= sys.version_info < (3,):
warnings.filterwarnings('ignore', 'could not open display') warnings.filterwarnings('ignore', 'could not open display')
__version__ = '2.0.0' __version__ = '2.0.1'