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
..
main	Merge branch 'dev' into java9-support	2018-07-16 19:37:30 +02:00
test/java/org/telegram/telegrambots/starter	Spring Boot autoconfiguration improvements.	2018-06-09 15:06:38 -03:00