summaryrefslogtreecommitdiffhomepage
path: root/sites/www
AgeCommit message (Collapse)Author
2016-04-23s/CFFI/libffi/ as per @reaperhulkJeff Forcier
2016-04-23Fix broken changelog doc linkJeff Forcier
2016-04-23Splice 1.x install docs back in as standalone document.Jeff Forcier
Plus related tweaks
2016-04-23Tweaks to install docs re #394Jeff Forcier
2016-04-23Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-04-22Merge branch '1.16'Jeff Forcier
2016-04-22Merge branch '1.15' into 1.16Jeff Forcier
2016-04-22Hack in a sleep() to avoid race conditions during timeout test.Jeff Forcier
(HOPEFULLY) closes #612
2016-02-27Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-02-27Merge branch '1.16'Jeff Forcier
2016-02-27Merge branch '1.15' into 1.16Jeff Forcier
2016-02-27Merge branch '1.14' into 1.15Jeff Forcier
2016-02-27Merge branch '1.13' into 1.14Jeff Forcier
2016-02-27Changelog re #697Jeff Forcier
2016-01-19Merge branch '1.16'Jeff Forcier
2016-01-19Merge branch '1.15' into 1.16Jeff Forcier
2016-01-19Merge branch '1.14' into 1.15Jeff Forcier
2016-01-19Merge branch '1.13' into 1.14Jeff Forcier
2016-01-19Changelog re #499, re #656Jeff Forcier
Closes #499
2016-01-01Merge branch '1.16'Jeff Forcier
2016-01-01Merge branch '1.15' into 1.16Jeff Forcier
2016-01-01Changelog re #652Jeff Forcier
2015-12-18Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2015-12-17Fix up changelog entry to be on specJeff Forcier
2015-12-17Merge branch 'master' of github.com:paramiko/paramikoAdam Meily
Conflicts: paramiko/sftp_file.py sites/www/changelog.rst
2015-12-16Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2015-12-10Merge branch '1.15' into 1.16Jeff Forcier
2015-12-10Merge branch '1.13' into 1.14Jeff Forcier
2015-12-10Merge branch '1.14' into 1.15Jeff Forcier
2015-12-10Changelog re #636Jeff Forcier
2015-12-04Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2015-11-05Cut 1.16Jeff Forcier
2015-11-05Typo fixJeff Forcier
2015-11-04Changelog closes #194Jeff Forcier
2015-11-04Changelog closes #467Jeff Forcier
2015-11-04add this back inAlex Gaynor
2015-11-04Merge branch 'master' into switch-to-cryptographyAlex Gaynor
Conflicts: .travis.yml paramiko/ecdsakey.py paramiko/transport.py
2015-11-03Reword changelog re #502 & add attributionJeff Forcier
2015-11-03Merge branch 'master' into 502-intJeff Forcier
2015-11-03Merge branch '1.15'Jeff Forcier
2015-11-03Merge branch '1.14' into 1.15Jeff Forcier
2015-11-03Merge branch '1.13' into 1.14Jeff Forcier
2015-11-03Changelog closes #401Jeff Forcier
2015-11-03Changelog re #525Jeff Forcier
2015-11-02Merge branch '1.15'Jeff Forcier
2015-11-02Cut 1.15.4Jeff Forcier
2015-11-02Merge branch '1.14' into 1.15Jeff Forcier
2015-11-02Cut 1.14.3Jeff Forcier
2015-11-02Merge branch '1.15'Jeff Forcier
2015-11-02Merge branch '1.14' into 1.15Jeff Forcier
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 04:40:16 +0000