From f602c962f9fc7ae3f576cb6f8947053459634bea Mon Sep 17 00:00:00 2001
From: Otto Winter <otto@otto-winter.com>
Date: Sun, 17 Mar 2019 16:08:26 +0100
Subject: [PATCH] Bump version to v1.12.0b3

---
 Doxygen               | 2 +-
 Makefile              | 2 +-
 _static/version       | 2 +-
 changelog/v1.12.0.rst | 8 +++++---
 conf.py               | 2 +-
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Doxygen b/Doxygen
index d8f23256d..5264af66e 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         = 1.12.0b2
+PROJECT_NUMBER         = 1.12.0b3
 
 # 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 9fd2c2193..7a0f0ea18 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ESPHOME_CORE_PATH = ../esphome-core
-ESPHOME_CORE_TAG = v1.12.0b2
+ESPHOME_CORE_TAG = v1.12.0b3
 
 .PHONY: html cleanhtml deploy help webserver Makefile netlify netlify-api api netlify-dependencies svg2png copy-svg2png
 
diff --git a/_static/version b/_static/version
index cfa233553..86920c89d 100644
--- a/_static/version
+++ b/_static/version
@@ -1 +1 @@
-1.12.0b2
\ No newline at end of file
+1.12.0b3
\ No newline at end of file
diff --git a/changelog/v1.12.0.rst b/changelog/v1.12.0.rst
index a127ee633..62e6f62e1 100644
--- a/changelog/v1.12.0.rst
+++ b/changelog/v1.12.0.rst
@@ -114,10 +114,12 @@ All changes
 - core: Add ESP32 camera support :corepr:`544`
 - docs: Cookbook Guide for Brilliant / Mirabella Genio Smart Plugs :docspr:`195` by :ghuser:`cryptelli`
 - esphome: Add ESP32 Camera :esphomepr:`475`
-- docs: Add native API User-Defined services :docspr:`171`
+- docs: Add native API User-Defined services :docspr:`171` (cherry-picked)
 - docs: BME280 environment micrograms -> grams :docspr:`198` by :ghuser:`hajdbo`
-- esphome: Changes for 1.12 :esphomepr:`482`
-- core: Fixes for 1.12 :corepr:`551`
+- esphome: Changes for 1.12 :esphomepr:`482` (cherry-picked)
+- core: Fixes for 1.12 :corepr:`551` (cherry-picked)
+- core: More changes for 1.12 :corepr:`552`
+- esphome: More changes for 1.12 :esphomepr:`483`
 
 Past Changelogs
 ---------------
diff --git a/conf.py b/conf.py
index a8c1d11cb..5a8ab3cca 100644
--- a/conf.py
+++ b/conf.py
@@ -73,7 +73,7 @@ author = 'Otto Winter'
 # The short X.Y version.
 version = '1.12'
 # The full version, including alpha/beta/rc tags.
-release = '1.12.0b2'
+release = '1.12.0b3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.