Edit page GeekiGeekiToDo

[wiki.git] / GeekiGeekiToDo

diff --git a/GeekiGeekiToDo b/GeekiGeekiToDo
index 1111c26e58a9d988b641fafb8bec8ab5069fca44..6b67e800db4e92b4021c03496dc825be6d4ffff5 100644 (file)
--- a/GeekiGeekiToDo
+++ b/GeekiGeekiToDo
@@ -2,6 +2,7 @@
 
  * Page delete
  * Page rename
+ * Page redirects (using symlinks)
  * Editing comment
  * Quick Find box in the menu
  * WikiCreole syntax: ##<****<macro param1 param2>****>##
@@ -16,5 +17,9 @@
  * Directory listing
  * Groups/ directory with group lists implemented as wiki pages with unordered lists
  * Includes (aka templates)
+ * Syntax hilighting for code blocks
+=== Nice to have ===
+
+ * A functionality to have custom merge strategy in git to merge different wiki/GeekiGeeki in a single one
 
  * See also the original PikiToDo