From 4f99911c220656253bf8583997a5ec39c54134b2 Mon Sep 17 00:00:00 2001
From: Aaron Campbell <aaron@xavisys.com>
Date: Thu, 5 Jul 2018 16:12:07 +0000
Subject: [PATCH] Bump 4.6 branch to version 4.6.12 Built from
 https://develop.svn.wordpress.org/branches/4.6@43410

git-svn-id: http://core.svn.wordpress.org/branches/4.6@43238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 3 +++
 wp-includes/version.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 93b5b80eb1..6afc720e33 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -60,6 +60,9 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 		<div class="changelog point-releases">
 			<h3><?php _e( 'Maintenance and Security Releases' ); ?></h3>
+			<p><?php printf( __( '<strong>Version %s</strong> addressed one security issue.' ), '4.6.12' ); ?>
+				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.6.12' ); ?>
+			</p>
 			<p><?php printf( __( '<strong>Version %s</strong> addressed some security issues.' ), '4.6.11' ); ?>
 				<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'https://codex.wordpress.org/Version_4.6.11' ); ?>
 			</p>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0b370fe96b..8071d5e80e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6.11';
+$wp_version = '4.6.12';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.