# HG changeset patch # User Marcin Kuzminski # Date 2018-09-10 07:53:58 # Node ID d2baff5b4ff60bef3ae71b8c83c617c337f33cd9 # Parent ef7f85259a6091176a7a0c1a3ce399159f0cb7a7 # Parent c2efa29debcc6e23902826291d75b89a1ba90286 release: merge back stable branch into default diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -40,3 +40,5 @@ 80085fb846cc948195a5c76b579ca34cbc49b59b 346f04fc8a18df3235defbe6e71bd552c0d46481 v4.12.2 764fdd752322f3e0c13ea00957f2d548bf4363a7 v4.12.3 b58038974a5cecbb9c100d32ad2e4c68582f1a78 v4.12.4 +e1d42d92a0fec0c80b56c82f37bc7b5472613706 v4.13.0 +c3ded3ff17e9bb2a47002a808984a7a946f58a1c v4.13.1 diff --git a/requirements.txt b/requirements.txt --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,8 @@ # our custom configobj https://code.rhodecode.com/upstream/configobj/archive/a11ff0a0bd4fbda9e3a91267e720f88329efb4a6.tar.gz?md5=9916c524ea11a6c418217af6b28d4b3c#egg=configobj==5.0.6 +atomicwrites==1.1.5 +attrs==18.1.0 dogpile.cache==0.6.6 dogpile.core==0.4.1 decorator==4.1.2