From 3723b4b1ea79990c8af1c26b93d744483757ee5e Mon Sep 17 00:00:00 2001
From: Michael H <michael@michaelhall.tech>
Date: Fri, 18 Oct 2019 17:54:27 -0400
Subject: [PATCH] Merge 3.1.6 (#3069)

* Version Bump

 - d.py 1.2.3 -> 1.2.4
 - Red 3.1.5 -> 3.1.6

This fixes a critical issue with voice connections.

* Merge changelog
---
 changelog.d/3069.fix.rst | 1 +
 redbot/__init__.py       | 2 +-
 setup.cfg                | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 changelog.d/3069.fix.rst

diff --git a/changelog.d/3069.fix.rst b/changelog.d/3069.fix.rst
new file mode 100644
index 000000000..bbe3572f3
--- /dev/null
+++ b/changelog.d/3069.fix.rst
@@ -0,0 +1 @@
+Discord.py is updated to 1.2.4 to handle a critical issue with voice connections
diff --git a/redbot/__init__.py b/redbot/__init__.py
index a0a4a7ac3..fffb3af7c 100644
--- a/redbot/__init__.py
+++ b/redbot/__init__.py
@@ -173,7 +173,7 @@ class VersionInfo:
         )
 
 
-__version__ = "3.1.5"
+__version__ = "3.1.6"
 version_info = VersionInfo.from_str(__version__)
 
 # Filter fuzzywuzzy slow sequence matcher warning
diff --git a/setup.cfg b/setup.cfg
index d3a812af9..ae033b1e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -38,7 +38,7 @@ install_requires =
     colorama==0.4.1
     contextlib2==0.5.5
     databases[sqlite]==0.2.5
-    discord.py==1.2.3
+    discord.py==1.2.4
     distro==1.4.0; sys_platform == "linux"
     fuzzywuzzy==0.17.0
     idna==2.8