changeset 7971:0ac93630a214

Merge stable
author Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
date Wed, 27 Nov 2019 20:47:49 +0100
parents 04dee6fdfdff (current diff) 09c92e6995fd (diff)
children c80f87eed7b6
files
diffstat 3 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Nov 27 20:30:56 2019 +0100
+++ b/.hgtags	Wed Nov 27 20:47:49 2019 +0100
@@ -73,3 +73,4 @@
 60f726162fd6c515bd819feb423be73cad01d7d3 0.4.0rc2
 19086c5de05f4984d7a90cd31624c45dd893f6bb 0.4.0
 da65398a62fff50f3d241796cbf17acdea2092ef 0.4.1
+bfa0b0a814644f0af3f492d17a9ed169cc3b89fe 0.5.0
--- a/MANIFEST.in	Wed Nov 27 20:30:56 2019 +0100
+++ b/MANIFEST.in	Wed Nov 27 20:47:49 2019 +0100
@@ -7,6 +7,7 @@
 include           LICENSE.md
 include           MIT-Permissive-License.txt
 include           README.rst
+include           conftest.py
 include           dev_requirements.txt
 include           development.ini
 include           pytest.ini
--- a/kallithea/__init__.py	Wed Nov 27 20:30:56 2019 +0100
+++ b/kallithea/__init__.py	Wed Nov 27 20:47:49 2019 +0100
@@ -31,7 +31,7 @@
 import sys
 
 
-VERSION = (0, 4, 99)
+VERSION = (0, 5, 0)
 BACKENDS = {
     'hg': 'Mercurial repository',
     'git': 'Git repository',