Ruben Bermudez
7daebe1318
Merge branch 'webhook' of https://github.com/addo37/TelegramBots into addo37-webhook
# Conflicts:
# telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
# telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/db/DBContext.java
# telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultAbsSender.java
# telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramLongPollingBot.java
# telegrambots/src/main/java/org/telegram/telegrambots/bots/TelegramWebhookBot.java