Merge Upstream

This commit is contained in:
Akamaru 2016-08-28 18:39:42 +02:00
parent a305708f01
commit e1be234af4

4
.gitignore vendored
View File

@ -2,6 +2,6 @@ config.lua
*.db
tg
tmp/*
miku/plugins/licht.lua
Bot-Kommandoliste.txt
miku/plugins/licht.lua
Bot-Kommandoliste.txt
msg.txt