diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:59:05 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 15:59:05 -0700 |
| commit | 752507a2978b0c6091ee737cd37ba1cb690926a2 (patch) | |
| tree | 2610670fc4edd07ae96851c4947a3c69d360cb88 /sites/shared_conf.py | |
| parent | b076c10d00ee2cb4d465291a4ef0a4be9f048d9a (diff) | |
| parent | de391e88e0a7e75cd977f162a883aa5ffdbdc591 (diff) | |
Merge branch 'master' into 267-int
Conflicts:
paramiko/client.py
paramiko/transport.py
sites/www/changelog.rst
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, } |