Mikubot-2/.gitignore

<<<<<<< HEAD
config.lua
=======
otouto/plugins/mokubot*
otouto/plugins/oubot*
>>>>>>> upstream/master
*.db
tg
Einige Upstream-Ändderungen 2016-07-25 13:47:39 +02:00			`<<<<<<< HEAD`
Committe aktuellen Status. NEU: - Twitter-Plugin (ohne Markdown bisher) - Get- Set-Plugins - 9GAG - Adfly - Redis-Integration - Google Search - Google Images (modifiziert, mit Blacklist, bisher ohne Caching) - Einige Plugins lokalisiert Das ist momentan noch alles WIP, das meiste ist einfach bloß copy&paste vom proprietären Brawlbot v1. 2016-06-11 14:46:41 +02:00			`config.lua`
Einige Upstream-Ändderungen 2016-07-25 13:47:39 +02:00			`=======`
fix stuff 2016-06-07 06:09:26 +02:00			`otouto/plugins/mokubot*`
otouto v3.12 Minor changes across the board. More planned. I also may have accidentally screwed with access permissions (so looks like every file is marked modified). Moved drua-tg.lua into the otouto/ directory. Added pokego-calculator.lua plugin (similar to pidgeycalc.com). 2016-07-25 11:03:35 +02:00			`otouto/plugins/oubot*`
Einige Upstream-Ändderungen 2016-07-25 13:47:39 +02:00			`>>>>>>> upstream/master`
help.lua and about.lua: /start now triggers about.lua blacklist.lua: Added username support. 2016-03-04 23:08:21 +01:00			`*.db`
			`tg`