# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1612176724 -3600
# Node ID 94b458d3b9615659a2409e2c9c2ee7baf479619b
# Parent  3c86d86fa9da7d30031a7d4f5c5527934ecd0947# Parent  e0279279e347800ee393eb43211da7fed1da31d7
release: merge with stable

Now that the release is out, we can merge back with the development branch.

diff -r 3c86d86fa9da -r 94b458d3b961 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Mon Feb 01 11:51:00 2021 +0100
+++ b/hgext3rd/evolve/metadata.py	Mon Feb 01 11:52:04 2021 +0100
@@ -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__ = b'10.2.0.post1'
+__version__ = b'10.2.1.dev'
 testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7'
 minimumhgversion = b'4.6'
 buglink = b'https://bz.mercurial-scm.org/'
diff -r 3c86d86fa9da -r 94b458d3b961 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Mon Feb 01 11:51:00 2021 +0100
+++ b/hgext3rd/topic/__init__.py	Mon Feb 01 11:52:04 2021 +0100
@@ -232,7 +232,7 @@
               b'topic.active': b'green',
               }
 
-__version__ = b'0.21.0'
+__version__ = b'0.21.1.dev'
 
 testedwith = b'4.6.2 4.7 4.8 4.9 5.0 5.1 5.2 5.3 5.4 5.5 5.6 5.7'
 minimumhgversion = b'4.6'