3.20170622

master
Simon McVittie 2017-06-22 09:25:25 +01:00
parent 60d79a6a79
commit 664f1f1977
3 changed files with 6 additions and 6 deletions

4
debian/changelog vendored
View File

@ -1,4 +1,4 @@
ikiwiki (3.20170112) UNRELEASED; urgency=medium ikiwiki (3.20170622) unstable; urgency=medium
* t/git-cgi.t: Wait 1 second before doing a revert that should work. * t/git-cgi.t: Wait 1 second before doing a revert that should work.
This hopefully fixes a race condition in which the test failed This hopefully fixes a race condition in which the test failed
@ -28,7 +28,7 @@ ikiwiki (3.20170112) UNRELEASED; urgency=medium
* debian: Use preferred https URL for Format of debian/copyright * debian: Use preferred https URL for Format of debian/copyright
* debian: Declare compliance with Debian Policy 4.0.0 * debian: Declare compliance with Debian Policy 4.0.0
-- Simon McVittie <smcv@debian.org> Sun, 14 May 2017 15:34:52 +0100 -- Simon McVittie <smcv@debian.org> Thu, 22 Jun 2017 09:24:57 +0100
ikiwiki (3.20170111) unstable; urgency=high ikiwiki (3.20170111) unstable; urgency=high

View File

@ -1,5 +1,5 @@
Name: ikiwiki Name: ikiwiki
Version: 3.20170111 Version: 3.20170622
Release: 1%{?dist} Release: 1%{?dist}
Summary: A wiki compiler Summary: A wiki compiler

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-01-11 18:18+0000\n" "POT-Creation-Date: 2017-06-22 09:25+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -583,11 +583,11 @@ msgstr ""
msgid "Password" msgid "Password"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/mdwn.pm:53 #: ../IkiWiki/Plugin/mdwn.pm:74
msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed" msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
msgstr "" msgstr ""
#: ../IkiWiki/Plugin/mdwn.pm:98 #: ../IkiWiki/Plugin/mdwn.pm:150
#, perl-format #, perl-format
msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)" msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
msgstr "" msgstr ""