diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 11:13:28 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-04-01 11:13:28 -0700 |
| commit | 6c4bea567374c95a1ab22072465da9985f9d744c (patch) | |
| tree | 71a80bdb94a645657e57c5a7a8b3e604ed793475 /tox.ini | |
| parent | 196b3cc110f68a5d328d4f24714b64a0704fd228 (diff) | |
| parent | cb6c4bec5d1f71347992ec7509c054fb5508c123 (diff) | |
Merge branch '1.12' into 1.13
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions