From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Wed, 16 Apr 2014 16:00:38 +0000 (-0400)
Subject: Actually put release note for bug 63444 in RELEASE-NOTES-1.23 in master
X-Git-Tag: 1.31.0-rc.0~16198
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27static%27%2C%20filename=%27css/bootstrap.css%27%29%20%7D%7D?a=commitdiff_plain;h=7dab5bfc68376752f3a607c5b5ab81eea8a10594;p=lhc%2Fweb%2Fwiklou.git

Actually put release note for bug 63444 in RELEASE-NOTES-1.23 in master

Change I886b44bd removed the note from RELEASE-NOTES-1.24 because the
change was backported to the REL1_23 branch, but it didn't actually put
the note into RELEASE-NOTES-1.23 in the master branch. This might be
problematic if REL1_23 later gets merges from master.

Change-Id: I0ee55deb9b44b7854146ca65b1c4fc6f8ab0e1f1
---

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index d0a8ec7d6b..2d7dfe9096 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -150,6 +150,8 @@ production.
   This requires at least one Redis 2.6+ server.
 * $wgProfileToDatabase was removed. Set $wgProfiler to ProfilerSimpleDB
   in StartProfiler.php instead of using this.
+* (bug 63444) Made it possible to change the indent string (default: 4 spaces)
+  used by FormatJson::encode().
 
 === Bug fixes in 1.23 ===
 * (bug 41759) The "updated since last visit" markers (on history pages, recent