diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 13:28:56 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 13:28:56 -0700 |
| commit | f22fe4b6009c349ae87df671fa9d410a5a6f684c (patch) | |
| tree | 3aed6114621991ee6e0bec2cefd330866aaef44f /tox.ini | |
| parent | cb6c4bec5d1f71347992ec7509c054fb5508c123 (diff) | |
| parent | dd2e23a23e4223fc8d520595bb973d5605b58e74 (diff) | |
Merge branch '1.11' into 1.12
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions