diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 13:15:39 -0800 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2015-11-02 13:15:39 -0800 |
| commit | df1b3f0af80d1f609a0588ed0ee13bad758799c7 (patch) | |
| tree | 583a48775ec56c15bb4206e73b3243ddc5cf08ec /tox.ini | |
| parent | 9a091e0494269ae5e6074877fb0b335181ad28ae (diff) | |
| parent | 07ff30537a225f9b9c2c31eaf9b376d412907c37 (diff) | |
Merge branch '1.15'
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions