chmilevfa
ad3dbfdd58
Merge branch 'dev' into java9-support
# Conflicts:
# telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/bot/AbilityBot.java
# telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/EndUser.java
# telegrambots-abilities/src/main/java/org/telegram/abilitybots/api/objects/MessageContext.java
# telegrambots-spring-boot-starter/src/main/java/org/telegram/telegrambots/starter/TelegramBotStarterConfiguration.java
# telegrambots/src/main/java/org/telegram/telegrambots/bots/DefaultBotOptions.java