Merge branch 'current' into next

2017-05-18 22:12:48 +02:00 · 2017-05-18 22:12:48 +02:00 · d5e7847682
commit d5e7847682
parent f4da8b0ac5 43ca01f66e
29 changed files with 335 additions and 51 deletions
--- a/source/_components/telegram_bot.markdown
+++ b/source/_components/telegram_bot.markdown
@ -223,7 +223,7 @@ action:

 An example to show the use of event_data in the action:

-```
+```yaml
 - alias: 'Kitchen Telegram Speak'
  trigger:
    platform: event