aboutsummaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b86614160..1456810e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-ikiwiki (3.20171002) UNRELEASED; urgency=medium
+ikiwiki (3.20180105) upstream; urgency=medium
* emailauth: Fix cookie problem when user is on https and the cgiurl
uses http, by making the emailed login link use https.
@@ -11,7 +11,7 @@ ikiwiki (3.20171002) UNRELEASED; urgency=medium
* Updated German basewiki and directives translation from
Sebastian Kuhnert.
- -- Joey Hess <id@joeyh.name> Mon, 25 Dec 2017 14:57:27 -0400
+ -- Joey Hess <id@joeyh.name> Fri, 05 Jan 2018 13:41:20 -0400
ikiwiki (3.20171001) upstream; urgency=medium