From 9c23006d31c5a70e5f8b60477862eb0b04281db6 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Sun, 11 Mar 2018 15:54:34 +0000
Subject: [PATCH] 3.20180311
---
CHANGELOG | 4 ++--
ikiwiki.spec | 2 +-
po/ikiwiki.pot | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 747058ff6..9e595e5e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-ikiwiki (3.20180229) UNRELEASED; urgency=medium
+ikiwiki (3.20180311) upstream; urgency=medium
[ Amitai Schleier ]
* Avoid unexpected full paths from find(1)
@@ -12,7 +12,7 @@ ikiwiki (3.20180229) UNRELEASED; urgency=medium
* Add a test asserting that no plugin is an empty file, to confirm
that the build fixes in 3.20180228 were successful
- -- Simon McVittie <smcv@debian.org> Fri, 09 Mar 2018 09:15:14 +0000
+ -- Simon McVittie <smcv@debian.org> Sun, 11 Mar 2018 15:53:34 +0000
ikiwiki (3.20180228) upstream; urgency=medium
diff --git a/ikiwiki.spec b/ikiwiki.spec
index db7f1693a..a55b9b008 100644
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
Name: ikiwiki
-Version: 3.20180228
+Version: 3.20180311
Release: 1%{?dist}
Summary: A wiki compiler
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index c41df3041..ac7d32015 100644
--- a/po/ikiwiki.pot
+++ b/po/ikiwiki.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-28 10:40+0000\n"
+"POT-Creation-Date: 2018-03-11 15:54+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -595,7 +595,7 @@ msgstr ""
msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
msgstr ""
-#: ../IkiWiki/Plugin/mdwn.pm:175
+#: ../IkiWiki/Plugin/mdwn.pm:180
#, perl-format
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr ""
--
2.39.5