Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / users / Edward_Betts.mdwn

diff --git a/doc/users/Edward_Betts.mdwn b/doc/users/Edward_Betts.mdwn
index 9b543562899d7ccad20508e2500a730ce90ddf40..61d6150ef21dcd092cb11b94bcbb27eb2d843eca 100644 (file)
--- a/doc/users/Edward_Betts.mdwn
+++ b/doc/users/Edward_Betts.mdwn
@@ -1,4 +1,4 @@
 My watchlist:
 
 My watchlist:
 

-[[inline pages="todo/allow_wiki_syntax_in_commit_messages todo/shortcut_with_different_link_text" archive="yes" sort="mtime" atom="yes"]]
+[[!inline archive="yes" sort="mtime" atom="yes" pages="todo/allow_wiki_syntax_in_commit_messages* or todo/shortcut_with_different_link_text* or todo/structured_page_data* or tips/convert_mediawiki_to_ikiwiki*"]]