diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:55:49 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-10-31 13:55:49 -0700 |
| commit | f3f543b31e0c6788b26d1f450db5e9642b31ee57 (patch) | |
| tree | cccb5c76d6a3554019d6f2719506e75562c90d03 /tox.ini | |
| parent | 4b7ec4a32ac15dfa35b3282793a8317cfd32837b (diff) | |
| parent | 0fea4262ea396a81926cebc2be39afdbb7129396 (diff) | |
| download | slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.gz slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.bz2 slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.tar.xz slixmpp-f3f543b31e0c6788b26d1f450db5e9642b31ee57.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions