Merge branch 'master' of github.com:slackhq/python-rtmbot

Conflicts: requirements.txt
2014-12-11 16:28:06 -08:00 · 2014-12-11 16:28:06 -08:00 · 49275291e1
commit 49275291e1
parent 5949fa9f05 68d3784533
3 changed files with 47 additions and 23 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,4 +1,5 @@
 requests
+python-daemon
 pyyaml
 websocket-client
 git+https://github.com/slackhq/python-slackclient.git