# HG changeset patch # User Marcin Kuzminski # Date 2018-09-10 07:57:17 # Node ID 201b917683c26d2d057d5db896f472453a49cf32 # Parent 95dae11a538877ad115435f9cc65c686b101d1dc # Parent f2a4f55df5d1a994bcdc33e557e3ba17af9e1b49 release: merge back stable branch into default diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -40,3 +40,5 @@ 9072253aa8894d20c00b4a43dc61c2168c1eff94 6a517543ea9ef9987d74371bd2a315eb0b232dc9 v4.12.2 7fc0731b024c3114be87865eda7ab621cc957e32 v4.12.3 6d531c0b068c6eda62dddceedc9f845ecb6feb6f v4.12.4 +3d6bf2d81b1564830eb5e83396110d2a9a93eb1e v4.13.0 +5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1 diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1632,7 +1632,7 @@ self: super: { }; }; "rhodecode-enterprise-ce" = super.buildPythonPackage { - name = "rhodecode-enterprise-ce-4.13.0"; + name = "rhodecode-enterprise-ce-4.13.1"; buildInputs = [ self."pytest" self."py" diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rhodecode-enterprise-ce 4.13.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2018-09-04 13:25+0200\n" +"POT-Creation-Date: 2018-09-04 13:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"