From 69207c22b9df7a6f52cf47b4766d4e9bb1d5d940 Mon Sep 17 00:00:00 2001 From: Otto Winter Date: Sun, 17 Mar 2019 20:47:35 +0100 Subject: [PATCH] Bump version to v1.12.0b4 --- Doxygen | 2 +- Makefile | 2 +- _static/version | 2 +- changelog/v1.12.0.rst | 1 + conf.py | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Doxygen b/Doxygen index 5264af66e..3fa63520a 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.0b3 +PROJECT_NUMBER = 1.12.0b4 # 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 7a0f0ea18..2e324dfb1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ESPHOME_CORE_PATH = ../esphome-core -ESPHOME_CORE_TAG = v1.12.0b3 +ESPHOME_CORE_TAG = v1.12.0b4 .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 86920c89d..56637c4b6 100644 --- a/_static/version +++ b/_static/version @@ -1 +1 @@ -1.12.0b3 \ No newline at end of file +1.12.0b4 \ No newline at end of file diff --git a/changelog/v1.12.0.rst b/changelog/v1.12.0.rst index 4e688430c..c78246f1e 100644 --- a/changelog/v1.12.0.rst +++ b/changelog/v1.12.0.rst @@ -145,6 +145,7 @@ All changes - 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` +- esphome: Update Hassio base image to 1.4.1 :esphomepr:`484` Past Changelogs --------------- diff --git a/conf.py b/conf.py index 5a8ab3cca..2c7786e93 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.0b3' +release = '1.12.0b4' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.