Akamaru/Mikubot-2
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Einige Upstream-Ändderungen

Browse Source
This commit is contained in:
Andreas Bielawski
2016-07-25 13:47:39 +02:00
parent 664d00b814 b7c81c464f
commit dd893d220b
5 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored Normal file → Executable file
View File

@@ -1,3 +1,8 @@
<<<<<<< HEAD
config.lua
=======
otouto/plugins/mokubot*
otouto/plugins/oubot*
>>>>>>> upstream/master
*.db
tg