From 7a643924c2d9abbd15592a1f7d3b496670a5bfaa Mon Sep 17 00:00:00 2001 From: Ian Stewart Date: Tue, 25 Nov 2014 20:38:25 +0000 Subject: [PATCH] Twenty Fifteen: correct number of menus used in comments Props jeherve, see #30149 Built from https://develop.svn.wordpress.org/trunk@30568 git-svn-id: http://core.svn.wordpress.org/trunk@30558 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentyfifteen/functions.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index 7fc5374fc2..429b5e1613 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -80,7 +80,7 @@ function twentyfifteen_setup() { add_theme_support( 'post-thumbnails' ); set_post_thumbnail_size( 825, 510, true ); - // This theme uses wp_nav_menu() in one location. + // This theme uses wp_nav_menu() in two locations. register_nav_menus( array( 'primary' => __( 'Primary Menu', 'twentyfifteen' ), 'social' => __( 'Social Links Menu', 'twentyfifteen' ), diff --git a/wp-includes/version.php b/wp-includes/version.php index 010744fc93..74df035d9e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-beta2-30567'; +$wp_version = '4.1-beta2-30568'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.