# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2020-10-12 21:06:36
# Node ID 3c1446c0e8d444ba4db71d66efc31b754bee70a1
# Parent  e9bd59d59c79237c1918f04573f9be7ad420e387
# Parent  90d2c0dfdb4d71133fb5f458d8a80b2427178514

release: merge back stable branch into default

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -67,3 +67,5 @@ 8841da3680fba841e5a54ebccd8ca56c078f7553
 4b0dec7fd80b1ca38e5073e5e562a5a450f73669 v4.19.3
 1485aa75ffe1b1ec48352dce7b7492d92f85e95f v4.20.0
 5b740274011766ef2f73803cc196d081e1e7f1d4 v4.20.1
+5a7835234e2c45e8fb8184c60f548a64b5842af8 v4.21.0
+26af88343015f8b89d5a66f92bc7547c51fcf0df v4.22.0
diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix
--- a/pkgs/python-packages.nix
+++ b/pkgs/python-packages.nix
@@ -784,7 +784,7 @@ self: super: {
     };
   };
   "rhodecode-vcsserver" = super.buildPythonPackage {
-    name = "rhodecode-vcsserver-4.20.0";
+    name = "rhodecode-vcsserver-4.22.0";
     buildInputs = [
       self."pytest"
       self."py"