diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 11:26:59 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 11:26:59 -0700 |
| commit | 7ab97439c5a90f9ab55f489719229a6cdcf85310 (patch) | |
| tree | f556256a346670431ab87e357ba8ed22ebe17b66 /sites/shared_conf.py | |
| parent | 49ae00822c910f62462fd881b1161bb8178b637d (diff) | |
| parent | a0f854d17fc59f0279d4d2b07d3fd810dfb1894e (diff) | |
Merge branch 'master' into 373-int
Conflicts:
paramiko/channel.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, } |