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
..
abilities	Merge branch 'dev' into java9-support	2018-07-16 19:37:30 +02:00
_Footer.md	Move separate commits (#157)	2016-11-17 02:41:12 +01:00
_Sidebar.md	updating wiki with page containing instance of http proxy using	2018-04-19 15:13:40 +03:00
Changelog.md	Version 3.6.1	2018-04-20 01:44:04 +02:00
Errors-Handling.md	telegrambots-meta java 9 supported	2018-07-08 01:41:21 +02:00
FAQ.md	Added FAQ	2018-04-19 15:51:30 +04:00
Getting-Started.md	Version 3.6.1	2018-04-20 01:44:04 +02:00
Home.md	Merge #197	2017-02-26 03:10:28 +01:00
How-To-Update.md	Closes #319	2018-04-01 12:20:55 +02:00
Using-Http-Proxy.md	update proxy usage page on wiki	2018-05-06 23:32:18 +03:00