Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / todo / web-based_image_editing.mdwn

diff --git a/doc/todo/web-based_image_editing.mdwn b/doc/todo/web-based_image_editing.mdwn
index 773adbfffa4908e3434b61009a26d8b9eed50ef1..a03206091841458b625bb566080fdb5a0294e9fc 100644 (file)
--- a/doc/todo/web-based_image_editing.mdwn
+++ b/doc/todo/web-based_image_editing.mdwn
@@ -1 +1,3 @@
-We could support web-based image editing, using something like [Snipshot](http://snipshot.com/).  Several comparisons of web-based image editors exist; we would need to choose which one(s) to support. --[[JoshTriplett]]
\ No newline at end of file
+We could support web-based image editing, using something like [Snipshot](http://snipshot.com/).  Several comparisons of web-based image editors exist; we would need to choose which one(s) to support. --[[JoshTriplett]]
+
+[[wishlist]]