Merge branch '1.14'

deceq · Sep 5, 2014 · eb7da84 · eb7da84
2 parents e55d9fb + e51420c
commit eb7da84
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -27,7 +27,6 @@ notifications:
       - "%{repository}@%{branch}: %{message} (%{build_url})"
     on_success: change
     on_failure: change
-    use_notice: true
   email: false
 after_success:
   - coveralls
diff --git a/dev-requirements.txt b/dev-requirements.txt
@@ -1,10 +1,9 @@
 # Older junk
 tox>=1.4,<1.5
 # For newer tasks like building Sphinx docs.
-# NOTE: Requires Python >=2.6
 invoke>=0.7.0,<0.8
 invocations>=0.5.0
 sphinx>=1.1.3
-alabaster>=0.6.0
+alabaster>=0.6.1
 releases>=0.5.2
 wheel==0.23.0
diff --git a/sites/shared_conf.py b/sites/shared_conf.py
@@ -12,7 +12,7 @@
     'description': "A Python implementation of SSHv2.",
     'github_user': 'paramiko',
     'github_repo': 'paramiko',
-    'gittip_user': 'bitprophet',
+    'gratipay_user': 'bitprophet',
     'analytics_id': 'UA-18486793-2',
     'travis_button': True,
 }