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

2018-07-16 19:37:30 +02:00

..

src

Merge branch 'dev' into java9-support

2018-07-16 19:37:30 +02:00

pom.xml

Update version to 3.6.2

2018-05-06 23:32:33 +03:00