diff --git a/CHANGELOG b/CHANGELOG index 054f8d05b9..81f25ee39b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -git-annex (7.20181106) UNRELEASED; urgency=medium +git-annex (7.20181121) upstream; urgency=medium * git-annex-shell: Fix hang when transferring the same objects to two different clients at the same time. (Or when annex.pidlock is used, @@ -31,7 +31,7 @@ git-annex (7.20181106) UNRELEASED; urgency=medium * Updated stack.yaml to lts-12.19; added stack-lts-9.9.yaml to support old versions of stack. - -- Joey Hess Tue, 06 Nov 2018 12:44:27 -0400 + -- Joey Hess Wed, 21 Nov 2018 14:22:47 -0400 git-annex (7.20181105) upstream; urgency=medium diff --git a/git-annex.cabal b/git-annex.cabal index 21dbecfe00..863b72463c 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 7.20181105 +Version: 7.20181121 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess