# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1555527490 -7200
# Node ID ede9b37572f032c7276a9dfa59785084bb077a78
# Parent  36632d514af265c21c97de5d3ffe19bc5d8f4ea6# Parent  f6099a171a9de9289f026df2e5467aefee08648a
branching: merge stable back into default

diff -r f6099a171a9d -r ede9b37572f0 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Wed Apr 17 20:54:28 2019 +0200
+++ b/hgext3rd/evolve/metadata.py	Wed Apr 17 20:58:10 2019 +0200
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '8.5.1.dev'
+__version__ = '8.6.0.dev'
 testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
 minimumhgversion = '4.4'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r f6099a171a9d -r ede9b37572f0 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Wed Apr 17 20:54:28 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Wed Apr 17 20:58:10 2019 +0200
@@ -179,7 +179,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.14.1.dev'
+__version__ = '0.15.0.dev'
 
 testedwith = '4.4.2 4.5.2 4.6.2 4.7 4.8 4.9'
 minimumhgversion = '4.4'