MrDetonia/Maki
1
0
Fork 0
mirror of https://github.com/MrDetonia/Maki.git synced 2024-11-22 11:54:16 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://gitla.in/MrDetonia/maki

Browse Source 
merging upstream
This commit is contained in:
Zac Herd 2016-12-01 19:30:22 +00:00
commit 6737b3dddf
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -1,5 +1,5 @@
# Maki - Discord bot written in Python # Maki - Discord bot written in Python
### The bot that sits on PEEPBEEPMEMECREEP and does things. ### The discord bot that does things.
--- ---