diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 13:23:02 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 13:23:02 -0700 |
| commit | 0e784d81131a369da88051e4c12dd6e4b5e3c8b1 (patch) | |
| tree | 4bec5f731196ced01797d11548dde6ca84f22c9e /sites/shared_conf.py | |
| parent | f258d1e207a21d4342dbc431fcc4a4dafe893e80 (diff) | |
| parent | 720806734a05d9de0f47588d816de05646a06f0b (diff) | |
Merge branch 'master' into 184-int
Conflicts:
paramiko/config.py
tests/test_util.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, } |