diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:26:52 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-08 14:27:21 -0700 |
| commit | 8b0e10df60bb8e3fac8f81959d7f3f39a8d0e000 (patch) | |
| tree | 4e0766b74d7688624f21766f2be0ff5d8e9cfae1 /sites/shared_conf.py | |
| parent | b0ffd7c9c8d0941ee95e6f133cb6697bfb6a9b99 (diff) | |
| parent | 24e022bdf656f272b4dafb76df1a7739965be2f9 (diff) | |
Merge branch 'master' into 372-int
Conflicts:
paramiko/channel.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, } |