summaryrefslogtreecommitdiffhomepage
path: root/sites
AgeCommit message (Collapse)Author
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18MehJeff Forcier
2018-09-18Cut 2.3.3Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Cut 2.2.4Jeff Forcier
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Cut 2.1.6Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Cut 2.0.9Jeff Forcier
2018-09-18Almost left the 1.17+ marker in the changelog.Jeff Forcier
Would not necessarily have caused issues but hey
2018-09-18Merge branch '2.2' into 2.3Jeff Forcier
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Fix and changelog re #1283Jeff Forcier
2018-09-18Fix a pseudo-bug re: responding to MSG_UNIMPLEMENTED w/ itselfJeff Forcier
2018-09-18Pull in changelog re #1292Jeff Forcier
Rest of merge was resolved with '-s ours' to keep those changes back on the old branches only.
2018-09-18Merge branch '2.1' into 2.2Jeff Forcier
2018-09-18Merge branch '2.0' into 2.1Jeff Forcier
2018-09-18Backport support for newer cryptography sign/verify APIs.Jeff Forcier
Implements #1292.
2018-09-17Merge branch '2.2' into 2.3Jeff Forcier
2018-09-17Merge branch '2.1' into 2.2Jeff Forcier
Foregoes a handful of unblackened bits to make the merge easier; will blacken next anyways
2018-09-17Merge branch '2.0' into 2.1Jeff Forcier
2018-09-17Blacken 2.0 with black 18.6b4Jeff Forcier
2018-09-17Changelog re #1291Jeff Forcier
2018-09-17Stars to dashesJeff Forcier
2018-08-22Changelog re #1262, closes #1262Jeff Forcier
2018-03-12Merge branch '2.1' into 2.2Jeff Forcier
2018-03-12Merge branch '2.0' into 2.1Jeff Forcier
2018-03-12Merge branch '2.2' into 2.3Jeff Forcier
2018-03-12Cherry-pick changelog entries from 1.xJeff Forcier
2018-03-12Cut 2.3.2Jeff Forcier
2018-03-12Merge branch '2.2' into 2.3Jeff Forcier
2018-03-12Cut 2.2.3Jeff Forcier
2018-03-12Merge branch '2.1' into 2.2Jeff Forcier
2018-03-12Cut 2.1.5Jeff Forcier
2018-03-12Merge branch '2.0' into 2.1Jeff Forcier
2018-03-12Cut 2.0.8Jeff Forcier
2018-03-12Merge branch '2.2' into 2.3Jeff Forcier
2018-03-12Merge branch '2.1' into 2.2Jeff Forcier
2018-03-12Merge branch '2.0' into 2.1Jeff Forcier
2018-03-12Changelog closes #1175Jeff Forcier
2017-11-29Merge branch '2.2' into 2.3Jeff Forcier
2017-11-29Merge branch '2.2' into 1051-intJeff Forcier
2017-11-07Merge branch '2.2' into 2.3Jeff Forcier
2017-11-07Merge branch '2.1' into 2.2Jeff Forcier
2017-11-07Merge branch '2.0' into 2.1Jeff Forcier
2017-11-07Changelog re #1108Jeff Forcier
[ci skip]