Merge remote-tracking branch 'intrigeri/fix_diffurl_vs._cgit'

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 208da2a0f4e1da6d4e2990f11cdd7c50a009320c..76178674f199c40fc72961c70473c06c1d34fe0a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,11 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
 
   * Added useragent config setting. Closes: #737121
     Thanks, Tuomas Jormola
+  * po: Add html_lang_code and html_lang_dir template variables
+    for the language code and direction of text.
+    Thanks, Mesar Hameed
+  * Allow up to 8 levels of nested directives, rather than previous 3
+    in directive infinite loop guard.
 
  -- Joey Hess <joeyh@debian.org>  Sat, 01 Feb 2014 16:53:35 -0400