diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 10:14:37 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-09-05 10:14:37 -0700 |
| commit | e51420c50b27b54086771d0f9077dab4aad82647 (patch) | |
| tree | 03d1160cdfeb3c2ad52c3b3406343701eee5796e /sites | |
| parent | 769fbac0353d1efb4213c78f5ec22a1247e4da9d (diff) | |
| parent | 43c5cdaa3094c59718c8df69b1de834aee15485c (diff) | |
Merge branch '1.13' into 1.14
Conflicts:
dev-requirements.txt
Diffstat (limited to 'sites')
| -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, } |