Merge branch 'master' into hydrabot

This commit is contained in:
hydrabolt 2015-08-14 13:26:07 +01:00
commit 17e8babf82

2
.gitignore vendored
View file

@ -1,5 +1,7 @@
# Created by https://www.gitignore.io
hydrabot/config.json
### Node ###
# Logs
logs