Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TinyMCE: include the upstream fix for inserting `<hr>` while the caret is in an inline element: b1618d1adb. 

Fixes #36165.
Built from https://develop.svn.wordpress.org/trunk@37074


git-svn-id: http://core.svn.wordpress.org/trunk@37041 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2016-03-23 21:45:28 +00:00
parent a2d62ccf32
commit a97d39785a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/tinymce/tinymce.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

4
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-beta4-37073';
$wp_version = '4.5-beta4-37074';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
@ -18,7 +18,7 @@ $wp_db_version = 36686;
*
* @global string $tinymce_version
*/
$tinymce_version = '4308-20160315';
$tinymce_version = '4308-20160323';
/**
* Holds the required PHP version