diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-20 00:25:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-20 00:25:32 -0700 |
| commit | 060c9ab6794cbe6c62c312b1f42bd3767ff66b80 (patch) | |
| tree | 4802e7d13643dc4546e44bdd2e135dd9ad73b34c /tox.ini | |
| parent | 78f03253983779673beaf3c102ae315707a49d2c (diff) | |
| parent | acd9c32a9f8ba5476ac238a7536c838789ed4ab5 (diff) | |
| download | slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.gz slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.bz2 slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.xz slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions