diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2016-04-28 19:54:43 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2016-04-28 19:54:43 -0700 |
| commit | 045f6de5f545ae2020c0a706269cf4d806234504 (patch) | |
| tree | 7af9f2b629299c8ba9b765634c07403fa9bd02ec /tox.ini | |
| parent | 471d46d5b982ca8cc1081523ba5248535534c497 (diff) | |
| parent | 35b414496431a0dfb1caba07fc84f2280250d0d9 (diff) | |
Merge branch '1.15' into 1.16
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions