aboutsummaryrefslogtreecommitdiff
path: root/doc/news/version_3.20140613.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/news/version_3.20140613.mdwn')
-rw-r--r--doc/news/version_3.20140613.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/news/version_3.20140613.mdwn b/doc/news/version_3.20140613.mdwn
new file mode 100644
index 000000000..ab9940a96
--- /dev/null
+++ b/doc/news/version_3.20140613.mdwn
@@ -0,0 +1,5 @@
+ikiwiki 3.20140613 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+ * only\_committed\_changes could fail in a git repository merged
+ with git merge -s ours.
+ * Remove google from openid selector, per http://xkcd.com/1361/"""]] \ No newline at end of file