summaryrefslogtreecommitdiffhomepage
path: root/sites
AgeCommit message (Expand)Author
2016-04-24Merge branch '1.15' into 1.16Jeff Forcier
2016-04-24Cut 1.15.5Jeff Forcier
2016-04-24Merge branch '1.17'Jeff Forcier
2016-04-24Merge branch '1.16' into 1.17Jeff Forcier
2016-04-24Merge branch '1.15' into 1.16Jeff Forcier
2016-04-24Changelog closes #578Jeff Forcier
2016-04-24Merge branch '1.17'Jeff Forcier
2016-04-24Merge branch '1.16' into 1.17Jeff Forcier
2016-04-24Changelog re #716, closes #716Jeff Forcier
2016-04-24Moar prep for 1.17Jeff Forcier
2016-04-24Changelog re #394Jeff Forcier
2016-04-24Merge remote-tracking branch 'alex/switch-to-cryptography' into 394-intJeff Forcier
2016-04-24Merge branch 'master' into 394-intJeff Forcier
2016-04-24crypto our cryptoAlex Gaynor
2016-04-24Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Merge branch '1.15' into 1.16Jeff Forcier
2016-04-24Changelog closes #729Jeff Forcier
2016-04-24Changelog re #649Jeff Forcier
2016-04-24Merge branch 'master' into 394-intJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Be clearerJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Apparently a whole lot of people noticed that tiny python 3 issueJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Oh hey this also fixes the only other open 1.16.1 ticket yeyJeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Changelog re #617, #679, #678, #685.Jeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Changelog re #619, re #613Jeff Forcier
2016-04-24Merge branch '1.16'Jeff Forcier
2016-04-24Merge branch '1.15' into 1.16Jeff Forcier
2016-04-24Expose some effectively-public Channel attributes in API docs.Jeff Forcier
2016-04-23Merge branch '1.16'Jeff Forcier
2016-04-23Merge branch '1.15' into 1.16Jeff Forcier
2016-04-23MehJeff Forcier
2016-04-23Changelog closes #632Jeff Forcier
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
2016-04-23Tweaks to install docs re #394Jeff Forcier
2016-04-23Merge branch '1.16'Jeff Forcier
2016-04-23Merge branch '1.15' into 1.16Jeff Forcier
2016-04-23Fix broken changelog doc linkJeff Forcier
2016-04-23Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-04-22Merge branch '1.15' into 1.16Jeff Forcier
2016-04-22Merge branch '1.16'Jeff Forcier
2016-04-22Hack in a sleep() to avoid race conditions during timeout test.Jeff Forcier
2016-02-27Merge branch 'master' into switch-to-cryptographyAlex Gaynor
2016-02-27Merge branch '1.15' into 1.16Jeff Forcier