Merge pull request #123 from lnalex/master
authorOrakaro <DTVD@users.noreply.github.com>
Tue, 16 Aug 2016 14:37:19 +0000 (23:37 +0900)
committerGitHub <noreply@github.com>
Tue, 16 Aug 2016 14:37:19 +0000 (23:37 +0900)
Add Pocket support

1  2 
docs/index.rst
rainbowstream/colorset/config
rainbowstream/rainbow.py
setup.py

diff --cc docs/index.rst
Simple merge
Simple merge
Simple merge
diff --cc setup.py
index 31300ea2614cdc0675a6281412a667783a8b88c5,1d4e49ecaffbd4d02fe95d81533b267cd5f15ada..a206274269653c4c0f9d36b55b28e60c6eed2b7a
+++ b/setup.py
@@@ -19,12 -13,10 +19,13 @@@ install_requires = 
      "pyfiglet",
      "twitter",
      "Pillow",
-     "PySocks"
+     "PySocks",
+     "pocket"
  ]
  
 +# Default user (considers non virtualenv method)
 +user = os.environ.get('SUDO_USER', os.environ['USER'])
 +
  # Copy default config if not exists
  default = os.path.expanduser("~") + os.sep + '.rainbow_config.json'
  if not os.path.isfile(default):