Merge branch 'master' into po

[git.ikiwiki.info.git] / doc / todo / integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn

diff --git a/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn b/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn
index 8fb1424c4cc985b118b19c73ab0230de83def48c..16d33b0bbb2908284713fa3651acf0aba71d7278 100644 (file)
--- a/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn
+++ b/doc/todo/integration_with_Firefox_and_Iceweasel_feed_subscription_mechanism.mdwn
@@ -9,3 +9,5 @@ configure their browser to subscribe to feeds via [[plugins/aggregate]] running
 on their site.  We could then provide the manual configuration settings as a
 [[tip|tips]], and perhaps provide an extension or other mechanism to set them
 automatically. --[[JoshTriplett]]
+
+[[wishlist]]