Merge "Fix so wfResetOutputBuffers doesn't break unit tests"

[lhc/web/wiklou.git] / RELEASE-NOTES-1.26

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index ff7f884..a532171 100644 (file)
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -170,6 +170,9 @@ changes to languages because of Phabricator reports.
   a lengthy deprecation period.
 * The ScopedPHPTimeout class was removed.
 * Removed maintenance script fixSlaveDesync.php.
+* Watchlist tokens, SpecialResetTokens, and User::getTokenFromOption()
+  are deprecated. Applications using those can work via the OAuth
+  extension instead. New tokens types should not be added.
 
 == Compatibility ==