From 5247520fe207047bfecf787c37f8d7beead0fdf8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 3 May 2018 06:42:25 +0000
Subject: [PATCH] Media: Add `aac` to the list of allowed file types.

Props desrosj.
Merges [42697] and [43135] to the 4.9 branch.
Fixes #42919.
Built from https://develop.svn.wordpress.org/branches/4.9@43136


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/functions.php | 1 +
 wp-includes/version.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index c50711238f..d09bc48e3b 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -2446,6 +2446,7 @@ function wp_get_mime_types() {
 	'dfxp' => 'application/ttaf+xml',
 	// Audio formats.
 	'mp3|m4a|m4b' => 'audio/mpeg',
+	'aac' => 'audio/aac',
 	'ra|ram' => 'audio/x-realaudio',
 	'wav' => 'audio/wav',
 	'ogg|oga' => 'audio/ogg',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 0b34e81e6d..d5513c83f9 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.6-alpha-43134';
+$wp_version = '4.9.6-alpha-43136';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.