diff options
| author | Matthias Witte <m.witte@telekom.de> | 2014-11-25 18:15:16 +0100 |
|---|---|---|
| committer | Matthias Witte <m.witte@telekom.de> | 2014-11-25 18:15:16 +0100 |
| commit | b3b0f2d0dff3aef736128935302aeb6adb1ee020 (patch) | |
| tree | 16d9fe959aede76a0a6ed4d1a6e59a90198dc6f8 /sites/shared_conf.py | |
| parent | 47da1935dc84784bfee2e493474232bf2e0d8d37 (diff) | |
| parent | 838ab5b23274ddea0b5671b7f2d5a295dcd02dfe (diff) | |
Merge upstream branch 'master' into add_sha2_support
Conflicts:
paramiko/transport.py
tests/test_transport.py
Diffstat (limited to 'sites/shared_conf.py')
| -rw-r--r-- | sites/shared_conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sites/shared_conf.py b/sites/shared_conf.py index 69908388..4a6a5c4e 100644 --- a/sites/shared_conf.py +++ b/sites/shared_conf.py @@ -12,7 +12,7 @@ html_theme_options = { '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, } |