From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 4 May 2010 19:05:47 +0000 (+0000)
Subject: Belated RELEASE-NOTES conflict for r65278
X-Git-Tag: 1.31.0-rc.0~36944
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/ajouter.php?a=commitdiff_plain;h=9304a7b297eebb03a0e410ed3df5713a7027d648;p=lhc%2Fweb%2Fwiklou.git

Belated RELEASE-NOTES conflict for r65278
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a3d8c38135..34bb3e14bc 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -150,6 +150,7 @@ in a negative namespace (which is invalid).
 * (Bug 23397) texvc in html mode renders \sim as &tilde; not &sim;
 * (Bug 23241) Remove License selector, because it is not used when uploading a
   new version.
+* (bug 23240) Add ID to namespace selector form on Special:Watchlist
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent