aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-09-15 21:11:17 +0100
committerSimon McVittie <smcv@debian.org>2014-09-15 21:11:17 +0100
commit3d1de970f11c3806b9c80781fab0825f58467a03 (patch)
tree4215e4ee4c1330b7306291370b45cdaeb832d4ec
parentea2ab6f885b97081c37f9034d8b7e12a0e34ad3e (diff)
downloadikiwiki-3d1de970f11c3806b9c80781fab0825f58467a03.tar
ikiwiki-3d1de970f11c3806b9c80781fab0825f58467a03.tar.gz
changelog, close bug
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn4
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b50b515b0..07b4339e5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium
before executing Perl code, so that PERL5LIB can point to a
non-system-wide installation of IkiWiki.
Thanks, Lafayette Chamber Singers Webmaster
+ * filecheck: accept MIME types not containing ';'
-- Simon McVittie <smcv@debian.org> Fri, 12 Sep 2014 21:23:58 +0100
diff --git a/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn b/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn
index 627b2c827..e179f09c8 100644
--- a/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn
+++ b/doc/bugs/can__39__t_upload_a_simple_png_image:_prohibited_by_allowed__95__attachments___40__file_MIME_type_is_application__47__octet-stream....mdwn
@@ -89,3 +89,7 @@ Weird... --[[anarcat]]
> > > > > > I've turned the version I suggested above into a proper branch.
> > > > > > Review by someone who can commit to ikiwiki.git would be appreciated.
> > > > > > --[[smcv]]
+
+> > > > > > > Turns out "someone who can commit" includes me.
+> > > > > > > [[Merged|done]] this version, we can revert or alter it if
+> > > > > > > Joey remembers a reason to require `;` --[[smcv]]