Merge branch 'current' into next

This commit is contained in:
Fabian Affolter 2017-05-18 22:12:48 +02:00
commit d5e7847682
No known key found for this signature in database
GPG key ID: E23CD2DD36A4397F
29 changed files with 335 additions and 51 deletions

View file

@ -35,5 +35,5 @@ Configuration variables:
- **api_key** (*Required*): The API token of your bot.
- **parse_mode** (*Optional*): Default parser for messages if not explicit in message data: 'html' or 'markdown'. Default is 'markdown'.
To get your `chat_id` and `api_key` follow the instructions [here](/components/notify.telegram/) .
To get your `chat_id` and `api_key` follow the instructions [here](/components/notify.telegram/).