From 629e2b70f7702eee65ad85466373ae9c96eec45b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Tue, 15 Sep 2015 14:27:44 +0000 Subject: [PATCH] Bump 4.2 branch to 4.2.5. Built from https://develop.svn.wordpress.org/branches/4.2@34182 git-svn-id: http://core.svn.wordpress.org/branches/4.2@34150 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- readme.html | 2 +- wp-admin/about.php | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/readme.html b/readme.html index c44623cfa4..cdf3e4e4f5 100644 --- a/readme.html +++ b/readme.html @@ -9,7 +9,7 @@

WordPress -
Version 4.2.4 +
Version 4.2.5

Semantic Personal Publishing Platform

diff --git a/wp-admin/about.php b/wp-admin/about.php index 8105de9885..6e85b919a6 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -41,7 +41,11 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
-

+

+

Version %1$s addressed some security issues and fixed %2$s bug.', + 'Version %1$s addressed some security issues and fixed %2$s bugs.', 2 ), '4.2.5', number_format_i18n( 2 ) ); ?> + the release notes.' ), 'http://codex.wordpress.org/Version_4.2.5' ); ?> +

Version %1$s addressed some security issues and fixed %2$s bug.', 'Version %1$s addressed some security issues and fixed %2$s bugs.', 4 ), '4.2.4', number_format_i18n( 4 ) ); ?> the release notes.' ), 'http://codex.wordpress.org/Version_4.2.4' ); ?>