diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2018-09-18 14:39:08 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2018-09-18 14:39:08 -0700 |
| commit | 817b4fec82390abb0a7b7b897c452b5e2ebdde89 (patch) | |
| tree | cc813dff132211655adf150dc50318196e76343d /setup.py | |
| parent | a87b98e10e644a310c6ba9cc428f396f0e3a1df9 (diff) | |
Pull in changelog re #1292
Rest of merge was resolved with '-s ours' to keep
those changes back on the old branches only.
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions