From d4f362fdfe17c885e417334b6677963193aa3542 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Wed, 6 Sep 2017 21:59:14 +0200
Subject: Sync with ikiwiki 3.20160506.

---
 ikiwiki/pagespec/attachment.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ikiwiki')

diff --git a/ikiwiki/pagespec/attachment.mdwn b/ikiwiki/pagespec/attachment.mdwn
index fa2bc58..868fb23 100644
--- a/ikiwiki/pagespec/attachment.mdwn
+++ b/ikiwiki/pagespec/attachment.mdwn
@@ -12,7 +12,7 @@ while allowing larger mp3 files to be uploaded by joey into a specific
 directory, and check all attachments for viruses, something like this could be
 used:
   
-	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or (mimetype(image/*) and maxsize(50kb)))
+	virusfree() and ((user(joey) and podcast/*.mp3 and mimetype(audio/mpeg) and maxsize(15mb)) or ((mimetype(image/jpeg) or mimetype(image/png)) and maxsize(50kb)))
 
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
-- 
cgit v1.2.3

n value='master' selected='selected'>master</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Unnamed repository; edit this file 'description' to name the repository.</td><td class='sub right'>Jonas Smedegaard</td></tr></table>
<table class='tabs'><tr><td>
<a href='/notmuch/?h=master'>summary</a><a href='/notmuch/refs/?h=master'>refs</a><a href='/notmuch/log/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread?h=master'>log</a><a href='/notmuch/tree/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread?h=master'>tree</a><a href='/notmuch/commit/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread?h=master'>commit</a><a class='active' href='/notmuch/diff/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread?h=master'>diff</a></td><td class='form'><form class='right' method='get' action='/notmuch/log/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread'>
<input type='hidden' name='h' value='master'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/notmuch/diff/?h=master'>root</a>/<a href='/notmuch/diff/tags?h=master'>tags</a>/<a href='/notmuch/diff/tags/bb?h=master'>bb</a>/<a href='/notmuch/diff/tags/bb/ee?h=master'>ee</a>/<a href='/notmuch/diff/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org?h=master'>handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org</a>/<a href='/notmuch/diff/tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread?h=master'>unread</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='h' value='master'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><div class='diffstat-header'><a href='/notmuch/diff/?h=master'>Diffstat</a> (limited to 'tags/bb/ee/handler.1005552.D1005546.164474219513826.ackdone@bugs.debian.org/unread')</div><table summary='diffstat' class='diffstat'>