Merge Upstream

Browse Source

Conflicts:
	README.md
	config.lua.example
	otouto/plugins/cleverbot.lua

...

This commit is contained in:

Akamaru 2017-02-16 14:41:35 +01:00

parent 7bfe62b917 e132de6191

commit 48e8c7e864

2 changed files with 189 additions and 189 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0

install-dependencies.sh Executable file → Normal file

Unescape Escape View File