From 915ff768465493567ee6836aa8ac0a34eea4d95b Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:14:56 +0900
Subject: [PATCH 1/3] Bump version to 2023.12.4

---
 Doxygen         | 2 +-
 Makefile        | 2 +-
 _static/version | 2 +-
 conf.py         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doxygen b/Doxygen
index e41710d6d..4447d7415 100644
--- a/Doxygen
+++ b/Doxygen
@@ -38,7 +38,7 @@ PROJECT_NAME           = "ESPHome"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 2023.12.3
+PROJECT_NUMBER         = 2023.12.4
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
diff --git a/Makefile b/Makefile
index 437db80aa..f766d481b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_PATH = ../esphome
-ESPHOME_REF = 2023.12.3
+ESPHOME_REF = 2023.12.4
 
 .PHONY: html html-strict cleanhtml deploy help live-html Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png minify
 
diff --git a/_static/version b/_static/version
index cee5dee76..0c4de628e 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-2023.12.3
\ No newline at end of file
+2023.12.4
\ No newline at end of file
diff --git a/conf.py b/conf.py
index 520b6e52b..b09cad8c2 100644
--- a/conf.py
+++ b/conf.py
@@ -69,7 +69,7 @@ author = "ESPHome"
 # The short X.Y version.
 version = "2023.12"
 # The full version, including alpha/beta/rc tags.
-release = "2023.12.3"
+release = "2023.12.4"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

From 51290a106f36cbc64534ed653eaec7fc726913df Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:18:05 +0900
Subject: [PATCH 2/3] Update changelog for 2023.12.4

---
 changelog/2023.12.0.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/changelog/2023.12.0.rst b/changelog/2023.12.0.rst
index 2e4e2edf3..f797b427e 100644
--- a/changelog/2023.12.0.rst
+++ b/changelog/2023.12.0.rst
@@ -72,6 +72,14 @@ Release 2023.12.3 - December 22
 - Fix dashboard logs when api is disabled and using MQTT :esphomepr:`5992` by :ghuser:`bdraco`
 - Fix broken configs with non-existent components :esphomepr:`5993` by :ghuser:`jesserockz`
 
+Release 2023.12.4 - December 25
+-------------------------------
+
+- dashboard: Only ping when polling is active :esphomepr:`6001` by :ghuser:`bdraco`
+- tt21100: restore init read :esphomepr:`6008` by :ghuser:`nielsnl68`
+- dashboard: Fix file writes on Windows :esphomepr:`6013` by :ghuser:`bdraco`
+- Display: fix class inherence in Python script :esphomepr:`6009` by :ghuser:`nielsnl68`
+
 Full list of changes
 --------------------
 

From 0feac979219183d075e5b5bc09e71a9fa636c4ff Mon Sep 17 00:00:00 2001
From: Jesse Hills <3060199+jesserockz@users.noreply.github.com>
Date: Mon, 25 Dec 2023 21:18:36 +0900
Subject: [PATCH 3/3] Update supporters for 2023.12.4

---
 guides/supporters.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guides/supporters.rst b/guides/supporters.rst
index 26296355b..5d46b4ef9 100644
--- a/guides/supporters.rst
+++ b/guides/supporters.rst
@@ -629,7 +629,6 @@ Contributors
 - `jakehdk (@jakehdk) <https://github.com/jakehdk>`__
 - `Jake Shirley (@JakeShirley) <https://github.com/JakeShirley>`__
 - `jakub-medrzak (@jakub-medrzak) <https://github.com/jakub-medrzak>`__
-- `James Braid (@jamesbraid) <https://github.com/jamesbraid>`__
 - `James Hirka (@jameshirka) <https://github.com/jameshirka>`__
 - `James Lakin (@jamesorlakin) <https://github.com/jamesorlakin>`__
 - `Jason (@jamman9000) <https://github.com/jamman9000>`__
@@ -679,6 +678,7 @@ Contributors
 - `JonasEr (@JonasEr) <https://github.com/JonasEr>`__
 - `Jonas Niesner (@jonasniesner) <https://github.com/jonasniesner>`__
 - `Jonathan Adams (@jonathanadams) <https://github.com/jonathanadams>`__
+- `Jonathan Laliberte (@JonLaliberte) <https://github.com/JonLaliberte>`__
 - `JonnyaiR (@jonnyair) <https://github.com/jonnyair>`__
 - `jonOfrie (@jonOfrie) <https://github.com/jonOfrie>`__
 - `Joris S (@Jorre05) <https://github.com/Jorre05>`__
@@ -702,6 +702,7 @@ Contributors
 - `Kaldek (@Kaldek) <https://github.com/Kaldek>`__
 - `Kamahat (@kamahat) <https://github.com/kamahat>`__
 - `Karl0ss (@karl0ss) <https://github.com/karl0ss>`__
+- `kartman85 (@kartman85) <https://github.com/kartman85>`__
 - `Kattni (@kattni) <https://github.com/kattni>`__
 - `Krzysztof Białek (@kbialek) <https://github.com/kbialek>`__
 - `Keilin Bickar (@kbickar) <https://github.com/kbickar>`__
@@ -750,6 +751,7 @@ Contributors
 - `Juraj Liso (@LiJu09) <https://github.com/LiJu09>`__
 - `Li Junru (@lijunru-hub) <https://github.com/lijunru-hub>`__
 - `lillborje71 (@lillborje71) <https://github.com/lillborje71>`__
+- `Caleb Pryor (@lilmansplace) <https://github.com/lilmansplace>`__
 - `Citric Lee (@limengdu) <https://github.com/limengdu>`__
 - `lingex (@lingex) <https://github.com/lingex>`__
 - `Markus (@Links2004) <https://github.com/Links2004>`__
@@ -1106,6 +1108,7 @@ Contributors
 - `signix (@signix) <https://github.com/signix>`__
 - `SiliconAvatar (@SiliconAvatar) <https://github.com/SiliconAvatar>`__
 - `Mark Lopez (@Silvenga) <https://github.com/Silvenga>`__
+- `Maximilian Ertl (@Sirs0ri) <https://github.com/Sirs0ri>`__
 - `Francisco J. Solis (@sisco0) <https://github.com/sisco0>`__
 - `Derek Hageman (@Sizurka) <https://github.com/Sizurka>`__
 - `Stephen Tierney (@sjtrny) <https://github.com/sjtrny>`__
@@ -1296,4 +1299,4 @@ Contributors
 - `Zsolt Zsiros (@ZsZs73) <https://github.com/ZsZs73>`__
 - `Christian Zufferey (@zuzu59) <https://github.com/zuzu59>`__
 
-*This page was last updated December 22, 2023.*
+*This page was last updated December 25, 2023.*