mirror of
https://github.com/arendst/Tasmota.git
synced 2025-07-24 11:16:34 +00:00
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)
This commit is contained in:
parent
5bd5e28652
commit
465aa4fffa
@ -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
|
||||
#
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user