Merge Upstream

2016-09-19 16:42:04 +02:00
parent 7a17d86566 4f10daba3e
commit 42fb22da4b
3 changed files with 2 additions and 4 deletions
--- a/config.lua.example
+++ b/config.lua.example
@@ -4,8 +4,6 @@ return {
 	bot_api_key = '',
 	-- Your Telegram ID.
 	admin = 1337,
-	-- Two-letter language code.
-	lang = 'de',
 	-- The channel, group, or user to send error reports to.
 	-- If this is not set, errors will be printed to the console.
 	log_chat = nil,