Daniel Evans f91fc99d35 Merge branch 'master' of git://github.com/reality/depressionbot into weboverhaul ...

Conflicts:
	modules/quotes/quotes.js
	modules/users/users.js
	run.js

2013-01-04 20:15:12 +00:00

..

config.json

Add rudimentary users module to track known users in a channel

2012-12-23 16:19:01 +00:00

strings.json

~mergeusers command [#94]

2013-01-02 21:06:43 +00:00

users.js

Merge branch 'master' of git://github.com/reality/depressionbot into weboverhaul

2013-01-04 20:15:12 +00:00