From 465aa4fffa77553a3243769549de3d9097af9289 Mon Sep 17 00:00:00 2001 From: arendst Date: Sat, 9 Sep 2017 19:14:11 +0200 Subject: [PATCH] v5.7.1 5.7.1 20170909 * Remove leading spaces from MQTT data * Fix webconsole special character entry * Allow # as prefix for color value * Fix Alexa detection and Hue App Update Request (#698, #854) --- fxttipe0.oib.txt | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 fxttipe0.oib.txt diff --git a/fxttipe0.oib.txt b/fxttipe0.oib.txt deleted file mode 100644 index dcad16ceb..000000000 --- a/fxttipe0.oib.txt +++ /dev/null @@ -1,33 +0,0 @@ -Merge branch 'development' - -# Conflicts: -# README.md -# sonoff/_releasenotes.ino -# sonoff/sonoff.ino -# sonoff/xdrv_snfled.ino -# sonoff/xdrv_ws2812.ino -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# .git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# On branch master -# Your branch is up-to-date with 'origin/master'. -# -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# modified: README.md -# modified: sonoff/_releasenotes.ino -# modified: sonoff/sonoff.ino -# modified: sonoff/webserver.ino -# modified: sonoff/xdrv_snfled.ino -# modified: sonoff/xdrv_wemohue.ino -# modified: sonoff/xdrv_ws2812.ino -# - -