From c22be8dbe8ecee923fd25c8bf8f5389ffbb9338b Mon Sep 17 00:00:00 2001
From: Andrew Ozz <admin@laptoptips.ca>
Date: Thu, 20 Nov 2014 22:23:24 +0000
Subject: [PATCH] TinyMCE: change the default font size from 100% to 16px to
 fix some back-compat issues, fixes #30038. Built from
 https://develop.svn.wordpress.org/trunk@30490

git-svn-id: http://core.svn.wordpress.org/trunk@30479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/js/tinymce/skins/wordpress/wp-content.css | 2 +-
 wp-includes/version.php                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index 04ec3e08d4..ea19a0e6a8 100644
--- a/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -15,7 +15,7 @@ html.ios {
 
 body {
 	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-size: 100%;
+	font-size: 16px;
 	line-height: 1.5;
 	color: #333;
 	margin: 9px 10px;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index d9ee980f6d..088b838371 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-beta2-30485';
+$wp_version = '4.1-beta2-30490';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.