diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-06-22 23:17:15 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-06-22 23:17:15 -0700 |
| commit | 5d6019a962fd1a30ed04520892836cdecc7fe19f (patch) | |
| tree | 6ee7b956a813af2f0507867dc861f4aead3479e2 /tox.ini | |
| parent | eb5df1aa3722e6e85b9683805b4088f4340918aa (diff) | |
| parent | 85ef2d8d0bcc92cd20d857d01bcf1bba56bc8edf (diff) | |
| download | slixmpp-5d6019a962fd1a30ed04520892836cdecc7fe19f.tar.gz slixmpp-5d6019a962fd1a30ed04520892836cdecc7fe19f.tar.bz2 slixmpp-5d6019a962fd1a30ed04520892836cdecc7fe19f.tar.xz slixmpp-5d6019a962fd1a30ed04520892836cdecc7fe19f.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions