Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 06:42:56 +02:00
Code Issues Projects Releases Wiki Activity

Editor: Merge two strings.

Browse Source 
Props pavelevap.
See #27756.
Built from https://develop.svn.wordpress.org/trunk@37441


git-svn-id: http://core.svn.wordpress.org/trunk@37407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-05-16 18:57:29 +00:00
parent a673a71f94
commit 693dfe3453
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-editor.php
View File

@ -847,7 +847,7 @@ final class _WP_Editors {
'Clear formatting' => __( 'Clear formatting' ),
'Bold' => __( 'Bold' ),
'Italic' => __( 'Italic' ),
'Code' => _x( 'Code', 'editor button' ),
'Code' => __( 'Code' ),
'Source code' => __( 'Source code' ),
'Font Family' => __( 'Font Family' ),
'Font Sizes' => __( 'Font Sizes' ),

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37440';
$wp_version = '4.6-alpha-37441';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.